Rename Project file for submission
Merge branch 'release-lab5'
removed bar restriction, updated readme, and renamed project
Conflict resolution
Prep for release
release-lab7 merge
Merge branch 'development' into release-lab7
Merge branch 'release-lab7'
Hotfix: Sql script
Merge branch 'master' into development