added gitignore
Merge branch 'master' of https://github.com/MechanicalNun/Server-app

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/MechanicalNun/Server-app