added a javadoc entry for the Observable pattern
and changed the name of the disc for better comprehension
Merge branch 'master' of https://github.com/mineichen/gameProject

merged the branches