added #ifndef to project2 files, updated Database constructor to add relations
Merge remote-tracking branch 'Project3/master'
Merge remote-tracking branch 'Project3/master'