Revert "Merge branch 'master' of github-francishoguecom:francishogue/starter"

This reverts commit b31a4bf8cb82332ac0ea5ad2fc9545729de7abd3, reversing
changes made to 7dee8d716dd09cb7f977baeff6c5c305dbdc6edb.