temp commit; merging Henry next
Merge branch 'henry'

Conflicts:
	hungry/MainWindow.cs
	hungry/Scene/SceneOne.cs
for Henry