About to change 6, 7, 8
1-6 working
Merge branch 'working-branch'

Conflicts:
	Project/ProjectFunctions.lsp