xiaoran lonelytwitter!!!!!!!!!!!!!!!!!
Merge branch 'master' of https://github.com/joshua2ua/lonelyTwitter
sadasdsadsadsadsadsadsad!!!!!!!!!!!!!!!!!!
Conflicts:
	src/ca/ualberta/cs/lonelytwitter/LonelyTweetModel.java