pls no
Merge branch 'master' of github.com:metropolia-portal/toyparty

Conflicts:
	.gitignore
	README.md