This is a test
test comment
test
test
file path changed
Merge branch 'Mary' of https://github.com/gdmmmy/IntelligentWeb into Mary

Conflicts:
	MJKTwitterQuery
	MJKTwitterQuery/WebContent/queryInterface.html
	MJKTwitterQuery/src/mjk/model/CheckinModel.java
	MJKTwitterQuery/src/mjk/model/VenuesModel.java