heatmap and wordcloud
merge

Merge branch 'master' of github.com:Sta523-Fa14/twitter

Conflicts:
	final project.R