Initial commit
Merge branch 'master' of https://github.com/fabiim/server

Conflicts:
	.gitignore