relocating and one comment
-more gui work
something... real scary
-implemented Text... pretty poorly
-improving gui elements
-Text Fully implemented
Merge branch 'master' into Mechanics-Sandbox
Merge branch 'Mechanics-Sandbox'

Conflicts:
	.gitignore