Rename
Merge branch 'Dev' of https://github.com/dkley/Project1-315 into Dev

Conflicts:
	Project_1/Database.cpp
	Project_1/Database.h