profilepage
Merge branch 'master' into profilepage
Merge pull request #30 from capms/message_board

Message board
changed some notification and teams stuff
no changes
fixed conflict
minor changes
Removed groups, replaced notifications with bulletins
Merge pull request #31 from capms/curley

Curley
Added admin features and some other minor changes
Merge pull request #32 from capms/curley

Added admin features and some other minor changes
adding ability to log in with email already saved in DB
Merge branch 'master' into loginNameParser
bringing schema up to speed with merged migrations
Merge pull request #33 from capms/loginNameParser

Adding outside email login for Industry users
profilepage
git status
aws
Merge pull request #34 from capms/profilepage

AWS
merge
Merge remote-tracking branch 'origin' into message_board