Jay's branch

Completely seperated the files, also got scene switching between options and main menu working