Added ApiController
get with the times
Merge branch 'master' of github.com:tripit-hackday/20140911

Conflicts:
	public/js/index.js
add stuff
tricks are for kids
Merge branch 'master' of github.com:tripit-hackday/20140911
doner