Beginning of party scene integration

still needs transition to manic and left/right movement/tracking
Began incorporating mich's changes to manic into combined file
Merge branch 'master' of https://github.com/Kappy0/NewBipolarRepo