added removed methods from merge
Merge branch 'master' of https://github.com/jebadirad/CSC335FinalProject