Added easymock to lib
Merge branch 'master' of https://github.com/l3370x/byu-340-hit