Screw commit messages! Who reads them anyway?!
Merge branch 'master' of https://github.com/LrsNate/CKYParser

Conflicts:
	CKYParser/src/main/Main.java