Merge branch 'development' of github.com:jbhardwaj/clare into development

Conflicts:
	Controller/ChallengesController.php
	View/Challenges/index.ctp
	View/Challenges/view.ctp
Added new menu bar which fixes #7, also got rid of some stuff from our weird conflicts
Attempting to finish fixing merge problems