initial verison of the server
Merge remote-tracking branch 'origin/master'

Conflicts:
	fartroulette/pom.xml
added test code
updated gitignore