setting up
Merge branch 'master' of github.com:aaroncrespo/gamification