Moved things around
Merge branch 'master' of https://github.com/famthegeek/ballin-octo-wookie

Conflicts:
	app/templates/application.hbs