Merge branch 'master' of https://github.com/larryberland/ushomego

Conflicts:
	app/assets/javascripts/application.js.coffee