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

Conflicts:
	src/connection.c