Home Page try 3
fix conflict
Merge branch 'master' into home_page
no real change here
Merge branch 'master' into pawprintLogin
fixing allowed (Strong) params for updating user
Merge pull request #26 from capms/profilepage

Profilepage
cleaning up conflicts with master, no major conflicts
added parser to grab first and last name from single sign on response
Merge pull request #29 from capms/profilepage

switching back AWS credentials to environment variables
Merge pull request #28 from capms/loginNameParser

Login name parser
Message Board
profilepage
Merge branch 'master' into profilepage
merging with master
message board
Merge pull request #30 from capms/message_board

Message board
changed some notification and teams stuff
no changes
fixed conflict