this
Merge branch 'master' of github.com:tripit-hackday/20140911

Conflicts:
	public/js/index.js