new changes
Merge branch 'orhan' of https://github.com/jackyujieyang/SwarthmoreConnection into orhan

Conflicts:
	public/js/app.js
Merge branch 'orhan' of https://github.com/jackyujieyang/SwarthmoreConnection into orhan
added a console.log
Merge branch 'orhan' of https://github.com/jackyujieyang/SwarthmoreConnection into orhan
fixed some bugs