Javadoc and comments. Minor bugfixes along the way.
Merge branch 'master' of https://github.com/Craig1987/MPPMS_Assignment