Added a lot.
Merge branch 'master' of https://github.com/austin94/bigdata

Conflicts:
	a.out