Draw
Merge branch 'master' of https://github.com/Rotten194/TJ-Hackathon-2013

Conflicts:
	Hackathon/src/com/teampigley/gui/DrawPanel.java
Gui cleanup
Merge branch 'master' of https://github.com/Rotten194/TJ-Hackathon-2013

Conflicts:
	Hackathon/src/com/teampigley/gui/ErrorPanel.java
Gui cleanup, winner