Merge branch 'master' of https://github.com/mansijoshi2013/CmpE273-Project

Conflicts:
dropwizard-project/logs/library.log