First Set up Master
Added Add functionality and passed JUnit Test as of 11/4/13