progress from home
progress
Merge branch 'master' of https://github.com/mvonahn/CollegeCommTracker into work
progress
Merge branch 'master' of https://github.com/mvonahn/CollegeCommTracker into work
progress commit.  Adding University controller and model to web service
checking in new files
Merge branch 'master' of https://github.com/mvonahn/CollegeCommTracker into work

Conflicts:
	app/js/controllers.js
	app/partials/commDetail.html
	app/partials/partial1.html
	ci/application/controllers/user.php
	ci/application/models/contact_model.php