Finished step 2. of the assignment

Also added commons-ii library