I dunno
Merge branch 'master' of https://github.com/tommysays/msc
Some GUI bullshit
Merge branch 'master' of https://github.com/tommysays/msc

Conflicts:
	MSC/src/userWord.java