Nothing changed
Merge branch 'Cuong_Parser' of https://github.com/timardis/CSCE_315_PROJECT_1 into Cuong_Parser

Conflicts:
	new_database/new_database.sdf
	new_database/new_database.v11.suo