inserted db object into parser
Merge branch 'master' of https://github.com/drm8026/Team-Project-1-

Conflicts:
	dbms/dbms/parser.cpp
Merge branch 'master' of https://github.com/drm8026/Team-Project-1-