asdf
sadf
Merge branch 'master' of https://github.com/jonasgreen/Cosmos

Conflicts:
	src/com/jg/cosmos/client/Cosmos.java