completed JavaDoc for classes written by Marvin
Merge branch 'master' of https://github.com/superduali/ClappyBit.git

Conflicts:
	ClappyBit/src/ClappyBit/GUI/MenuScreen.java