Changed main loop
Merge branch 'master' of https://github.com/matthewmfox/6.830-final-project

Conflicts:
	db.cpp