i need y
merge by keeping alix's code

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

Conflicts:
	conflict/charlottescode