merge
Merge branch 'master' of https://github.com/lctyler/Infamy

Conflicts:
	Infamy/project.greenfoot
Merge branch 'master' of https://github.com/lctyler/Infamy

Conflicts:
	Infamy/project.greenfoot
Merge branch 'master' of https://github.com/lctyler/Infamy
merge
Merge branch 'master' of https://github.com/lctyler/Infamy

Conflicts:
	Infamy/project.greenfoot
Added restart with space or enter, made idle animation better
Merge branch 'master' of https://github.com/lctyler/Infamy