commit before pull
Merge branch 'master' of github.com:davetetreault221/Gamification

Conflicts:
	ci/application/controllers/news.php