sprite wip
Merge branch 'master' of github.com:gamesoftheyear/g
sprite wip -- world content fixes