project updated -ER
editted requirements -PS
Merge remote-tracking branch 'origin/patrick-branch'
added back week 1 doc
Merge branch 'eliutt-branch'

Conflicts:
Database Management System/Database.cpp
Database Management System/Database.h
Revert adc3e46..c8799f2

This rolls back to commit adc3e4670b35ffcd6498c12018eda387bb1c3e6b.
not needed -ER
Revert 0f730e5..eafc910

This rolls back to commit 0f730e53d009e852d8fafc6da888e28fa8d6fe97.
Merge branch 'master' into eliutt-branch

Conflicts:
	Database Management System/Database.cpp
	Database Management System/Main.cpp
learning github added to requirements -ER
from other database folder
select update
stuff deleted
updated main
unneeded files that annoy me
stupid thing
testing
Merge branch 'master' into eliutt-branch

Conflicts:
	Database Management System/Database.cpp
Merge branch 'eliutt-branch'
just checking something