old master
Merge branch 'master' of https://github.com/jackyujieyang/SwarthmoreConnection

Conflicts:
	public/js/app.js