Second iteration of the code. Has major flaws which I hope to address quickly.
Being forced to commit.
Merge branch 'master' of http://github.com/akbernath/bigdata_proj1

Conflicts:
	.gitignore