Revamped Makefile with separate targets
New version
Merge branch 'master' of https://github.com/scantwell/CS283BigDataProject

Conflicts:
	src/connection.c
Merge branch 'master' of https://github.com/scantwell/CS283BigDataProject

Conflicts:
	datamap
	src/connection.c
Update