progress commit
merge branch 'master' of https://github.com/mvonahn/CollegeCommTracker

Conflicts:
	.idea/workspace.xml
	app/partials/partial1.html
Merge branch 'master' of https://github.com/mvonahn/CollegeCommTracker

Conflicts:
	.idea/workspace.xml