~ah forgot to commit changes I made.. forgot what I did
~tried fixing collisions
+inventory base
+cPlayer::move
+Art