Partially finished Generator (for SystemWorld only) and a button fix (I
think).  I just wanted to grab latest from repo.
Forgot to add.
I dont believe that I have conflicts.
Merge branch 'master' of
https://github.com/virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/PlayOptions/BeginButton.class
	workspace/Manifest Destiny/bin/util/Button.class
	workspace/Manifest Destiny/src/PlayOptions/BeginButton.java
	workspace/Manifest Destiny/src/util/Button.java
Merge branch 'master' of
https://github.com/virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/Worlds/MenuWorld.class
	workspace/Manifest Destiny/bin/util/Button.class