Bunch o' changes
Merge branch 'master' of https://github.com/bdscott/hack-junkie

Conflicts:
	app/Controller/CompetitionsController.php
Merge branch 'master' of https://github.com/bdscott/hack-junkie