Tweaked some more...werid error at the moment but very close to working.
Merge branch 'master' of https://github.com/bmw1986/theHangman

Conflicts:
	Main.java
	Paint.java