App skeleton
Merge branch 'master' of github.com:dohzya/Hackinder

Conflicts:
	app/views/main.scala.html