Merge amepe/Server

Conflicts:
	.gitignore
It actually works!