Im scared

I have not committed in a while
Merge branch 'master' of https://github.com/agrigoroi/miniature-tribble

Conflicts:
	app/views/index.scala.html
I am very clever
Alex is stooopid
Merged