Menu State implementated
MenuRoom State expanded
Player cpp formatted I guess
Menufight State expanded
added some stuff and merged conflicts