most of gameplay working, added style
fixed merge conflictsgit