First commit
Merge branch 'master' of https://github.com/Zetch/Testproject-backend

Conflicts:
	.gitignore