added stuff
merge to keep alix's

Merge branch 'master' of https://github.com/gitelman/BigData

Conflicts:
	Project1/conflict-test.txt