added new stuff
Merge remote-tracking branch 'origin/master'
t
Merge remote-tracking branch 'origin/master'
game logic still has errors but it works