Updated README.md
Merge branch 'master' of https://github.com/gijswijs/scala-play-starter

Conflicts:
	README.md