result.jsp update by xincheng
Merge branch 'master' of git@github.com:wgychris/Task8.git
Merge branch 'master' of git@github.com:wgychris/Task8.git
result.jsp and tweetbean
Merge branch 'master' of git@github.com:wgychris/Task8.git

Conflicts:
	TravelPlan/src/model/GetTweets.java
Merge branch 'master' of git@github.com:wgychris/Task8.git

Conflicts:
	TravelPlan/src/model/GetTweets.java