last minute bugs/tests
Merge branch 'master' of github.com:theJenix/potential-adventure