daft
Merge branch 'master' of https://github.com/martty/sysc

Conflicts:
	sorhajokapitanymag.cpp