Update
Merge branch 'master' of https://github.com/UrjalaCoder/codename-rain

Conflicts:
	Codename Rain/src/tuomas/rain/graphics/SpriteSheet.java