working on game class
merge
merge hell
added removed file