Ignore
Merge branch 'master' of https://github.com/8Wasserman/BloodAndGuts

Conflicts:
	Greenfoot/B&G/project.greenfoot