Riese changes
Allow merge
Added junk
Riese changes
Merge remote-tracking branch 'origin/master' into Dan
STUFF COMMITTED

YAY BOY!
styles and addXp

DONT WORK RIGHT
commit the BRANCH
Gitignore
Merge branch 'Thomas'
gitignore
Merge remote-tracking branch 'origin/Dan'

Conflicts:
	.classpath
	.gwt/.gwt-log
	.settings/com.google.appengine.eclipse.core.prefs
	src/com/clashroom/client/services/UserInfoService.java
	src/com/clashroom/client/services/UserInfoServiceAsync.java
	src/com/clashroom/client/user/SetupUser.java
	src/com/clashroom/client/window/UserInfoWindow.java
	src/com/clashroom/server/impl/UserServiceImpl.java
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/css/pages.css
Some merge fixes
Fixed the double task exp bug
Merging Riese's branch
Cleanup