4-1-2014

Updated the class diagram to reflect changes made on the previous
commit.