add git ignore
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop

Conflicts:
	.gitignore