profilepage
Merge branch 'master' into profilepage
Merge pull request #31 from capms/curley

Curley
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
style stuff
fixed conflicts
messing with modals
Added notifications for messages/comments, fixed modal issue for navbar, changed bulletin table to allow for message notifications