Added is_teacher boolean to user. Added a before_filter to ensure user is teacher.
resolving merge conflicts
Merge branch 'master' of github.com:ArriveApp/arrive-server