forgot, random stuff
fixed merge conflict
merg conflict fixed
Merge branch 'master' of https://github.com/RyanSUP/gb_game
fixes #7