changed name, added ScrollPanel and other stuff. broke something.
added TextPanel, and other stuff. broke something.
Merge branch 'master' of https://github.com/microwaveabletoaster/pygameGUI

Conflicts:
	pyGui.py