ER diagram updated 2/28
Merge pull request #38 from JohnCannonIT/master

ER diagram updated 2/28
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
queries 1-7
Merge pull request #39 from cstclair/master

queries 1-7
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment