changing game demo and map generator
Changed names, added Ryan's updates, and changed to mapGen
Committing some tweaks to the engine. The ability to save and load maps
properly, and a few test maps for demo.
Merge remote-tracking branch 'origin/GavinBranch'

Conflicts:
	DynamoEngine/bin/Tools/MapGenerator.class
	DynamoEngine/src/gameDemo/Game.java
Merge remote-tracking branch 'origin/GavinBranch'
Merged with Gavin stuff and resolved errors.
Fixed things for real this time.
Did some Jpopupstuff