new changes
Merge branch 'master' of https://github.com/scpenland/turbo-octo-archer

Conflicts:
	app/js/controllers.js