2014-05-14
Merge branch 'master' of https://github.com/fridamat/HangMan

Conflicts:
	src/StartFrame.java
frameeeezzz
sss