palette factory
Merge branch 'master' of https://github.com/srwareham/SLogo

Conflicts:
	src/control/InstructionMapFactory.java