did some work in the database so that we can display courses
Merge remote-tracking branch 'sam/master'
fixing courses
fixing the user model class
Merge remote-tracking branch 'CodyHoward/master'
Fixed a few errors post merge