progress
Merge branch 'work' of https://github.com/mvonahn/CollegeCommTracker

Conflicts:
	app/partials/partial1.html
Merge branch 'work' of https://github.com/mvonahn/CollegeCommTracker
moving model