models controllers
Merge branch 'models'

Add models to the master file
Merge branch 'master' of github.com:sneubig/HealthyCompetition