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

Conflicts:
	dropwizard-project/logs/library.log
	dropwizard-project/src/main/java/edu/sjsu/cmpe/projectdemo/domain/RootPath.java