Merge pull request #4 from mreist/Jay's-Branch

Jay's branch
Merge pull request #10 from mreist/Nicks-Branch

Merge pull request #4 from mreist/Jay's-Branch
Merge pull request #11 from mreist/Jay's-Branch

Jay's branch
Split up all code, got scene switching to work
Seperated files, scene switching between main menu and options is
operational
Merge remote-tracking branch 'origin/master'