blzakgfmlke
fsf
Merge branch 'master' of heroku.com:stormy-caverns-2954

Conflicts:
	app/views/home.scala.html
	build.sbt
	conf/routes