Cleaning up
Merge branch 'master' of https://github.com/Squadron6/Squad604

Conflicts:
	Pisces/Colourizer.h
fixed main.cpp and others

working copy of graphmaker can be generated now