resolve conflicts.
Merge branch 'develop' into news

Conflicts:
	src/edu/nyu/cs/cs2580/handler/NewsQueryHandler.java
Merge branch 'news' into develop