Updating Commit
Merge branch 'master' of https://github.com/smflorentino/tweetdata.git

Conflicts:
	src/code/DataAggregate.java