add multi and server choice
Merge branch 'master' of github.com:robinbach/DoodleDropJavaGame

Conflicts:
	src/doodledrop/ClientDemo.java
	src/doodledrop/Constants.java