first weekend work
Merge branch 'master' of https://github.com/GreetersPL/api

Conflicts:
	.gitignore