Merge amepe/Server

Conflicts:
	.gitignore