commit for testing
Merge branch 'master' into message_board

Conflicts:
	capms/app/views/layouts/application.html.erb
fixed edit page issue
fixed conflicts
approval work
Merge pull request #40 from capms/profilepage

Profilepage
fixed conflicts
Changes to home and message board
Changes to the home and message board
Merge pull request #41 from capms/message_board

Message board
Added button functionality for publication for the first file of teams.
s

notsurewhythisishappenin  quit
done
finished the button stuff for publishing. Fixed resume modal.
File upload display
Merge branch 'master' into profilepage

adding upload functionality
Merge pull request #42 from capms/curley

Curley
File upload display