XYZ
Merge branch 'master' of https://github.com/Aare-/KrakJam2013

Conflicts:
	krakjam2013/src/com/subfty/krkjam2013/Krakjam.java
	krakjam2013/src/com/subfty/krkjam2013/util/Art.java
Merge branch 'master' of https://github.com/Aare-/KrakJam2013

Conflicts:
	krakjam2013-android/project.properties
	krakjam2013/src/com/subfty/krkjam2013/util/Art.java
Merge branch 'master' of https://github.com/Aare-/KrakJam2013