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

Conflicts:
	Canopus/bin/de/datpixelstudio/canopus/Canopus.class
Merge branch 'master' of https://github.com/kinxz/Canopus.git
f1 fix
Dat commit
Dat commmit?!
Dat commit
Merge branch 'master' of https://github.com/kinxz/Canopus.git

Conflicts:
	Canopus/bin/de/datpixelstudio/canopus/Canopus.class