Resolve #7

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