Added javadoc and comments

This file is sent in to the teacher for deadline1, 2014-02-07