First commit
Merge branch 'master' of https://github.com/Oskar-Andersson/play-websocket-tjatt

Conflicts:
	.gitignore