...
Merge branch 'master' of https://github.com/mmconrad/airfare-faces

Conflicts:
	public/js/main.js
Resolved edit differences
erge branch 'master' of https://github.com/mmconrad/airfare-faces