> Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
Francis-Veilleux-Gabourys-MacBook:cardshifter.github.io francisveilleux-gaboury$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

Untracked files:
(use "git add <file>..." to include in what will be committed)

prettify-test/

nothing added to commit but untracked files present (use "git add" to track)
Francis-Veilleux-Gabourys-MacBook:cardshifter.github.io francisveilleux-gaboury$ git merge develop