fixes

testing stuff
Merge branch 'master' of https://github.com/alveyworld-dev/nothing

Conflicts:
	.DS_Store
jace stuff
jace changes