Updated graphics?
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/client.js
Removed stuff
Added stuff