Working good
Merge branch 'master' of https://github.com/scantwell/CS283BigDataProject

Conflicts:
	datamap