Test
Merge branch 'master' of https://github.com/kinxz/Canopus.git

Conflicts:
	Canopus/canopus/src/de/datpixelstudio/canopus/Player.java
DrawTest class
Draw Class