added javadoc
Merge branch 'master' of https://github.com/wuiidl/Thesis.git