Code merged

After a few hours got all the new stuff merged into the old. Also got alot of things updated and fixed a few potential bugs too.

Some things that I want to focus a bit on right now are:

• Fully removing the old PauseMenu class and using the new Pause state handler. (since there is already an in-game menu there is no real need for a pause menu as well.)
• More work on the main menus (getting them to display properly and such)
• Clean up the old item code
• Fix various things that are missing that I keep putting off