tried working on elect
finished write function
sdf file; have to commit
Removing old files!
Added new database files!
Database::update() and Database::delete_from()
Database::update() and Database::delete_from)
Merge Phase II onto master

Merge remote-tracking branch 'remotes/origin/richa_parser'

Conflicts:
	.gitignore
	new_database/database_library/Condition.cpp
	new_database/database_library/Condition.h
	new_database/database_library/Database.cpp
	new_database/database_library/Database.h
	new_database/database_library/Parser.h
	new_database/database_library/Table.cpp
	new_database/database_library/database_library.vcxproj.filters
	new_database/new_database.sdf
	new_database/new_database/DatabaseTesting.cpp