Workspace fixes
Merge branch 'master' of https://github.com/SoBiohazardous/Modjam4

Conflicts:
	.gitignore