Executive summary
bb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Documents/Documentation/Database Documentation.docx
Merge branch 'master' of https://github.com/Tanza/VirtualEnvironments-Project