First commit
Merge branch 'master' of github.com:akleine01/wimsApi

Conflicts:
	.gitignore
	README.md