added new branch
Merge branch 'master' of https://github.com/abbystevens/PrimerTeamProject into calzadilla
Added massage types and header pic.
Merge branch 'master' into calzadilla

Conflicts:
	.DS_Store