Some STuff
Merge branch 'master' of https://github.com/The-Art-of-Big-Social-Data/info480

Conflicts:
	.Rhistory