Adding missing files

Missing some files from previous commit
Merge branch 'master' of https://github.com/ScreamingGreen/Sculptor

Conflicts:
	.gitignore