modified:   TimeManagement.java
	modified:   WEB-INF/classes/edu/rice/rubbos/servlets/TimeManagement.class
	modified:   rubbos.war
Merge branch 'master' of https://github.com/faizulbari/rubbos-project

Conflicts:
	webapp/WEB-INF/classes/edu/rice/rubbos/servlets/TimeManagement.class
	webapp/rubbos.war

	new file:   .gitignore
	modified:   webapp/Makefile
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/AcceptStory.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/Author.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/BrowseCategories.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/BrowseStoriesByCategory.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/Config.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/ModerateComment.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/OlderStories.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/PostComment.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/RegisterUser.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/RejectStory.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/ReviewStories.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/RubbosHttpServlet.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/Search.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/ServletPrinter.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/StoreComment.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/StoreModeratorLog.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/StoreStory.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/StoriesOfTheDay.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/SubmitStory.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/TimeManagement.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/ViewComment.class
	deleted:    webapp/WEB-INF/classes/edu/rice/rubbos/servlets/ViewStory.class
	deleted:    webapp/rubbos.war
	modified:   .gitignore