took off my stupid comments
Merge branch 'eliutt-branch'

Conflicts:
	Database Management System/Parser.cpp