style stuff
fixed conflicts
aws secrets
aws secrets
aws secrets
messing with modals
Added notifications for messages/comments, fixed modal issue for navbar, changed bulletin table to allow for message notifications
Merge pull request #35 from capms/curley

Curley
Changed edit page for admin/student/industry, made button to leave team on team/show page, when users leave team and no team members left on team, team deletes, fixed some css on teams/users, some other stuff
Merge pull request #36 from capms/curley

Changed edit page for admin/student/industry, made button to leave team ...
Merge pull request #37 from capms/message_board

Message board
footer work in progress
Merge branch 'master' of https://github.com/capms/fallproject
commit for testing
Merge branch 'master' into message_board

Conflicts:
	capms/app/views/layouts/application.html.erb
AWS Teams page
fixed conflicts
Merge pull request #38 from capms/profilepage

Profilepage
fixing merge
added footer and updated class title/description on homepage