Starting merge
Added in start mask

Fixed lighting
ignoring files
Merge branch 'refs/heads/merge' into final

Conflicts:
	.gitignore