112
Merge branch 'master' of https://github.com/AllUserCan/AmigoServer

Conflicts:
	Server/code/Server.java
2014/11/11  Quasi-demo