aws secrets
aws secrets
aws secrets
merge
Merge remote-tracking branch 'origin' into message_board
Merge pull request #35 from capms/curley

Curley
Merge pull request #36 from capms/curley

Changed edit page for admin/student/industry, made button to leave team ...
new message system
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
fixed edit page issue
fixed conflicts
added footer and updated class title/description on homepage