Fixed some stuff
Merge branch 'master' of github.com:BaldyBadger/baldybadger
changed something