threw in temp credits scene
fixing things?
Merge branch 'master' into HEAD

Jarvis time!
Merge branch 'new_branch_name' into alissa
Merging new changes
delete xcode genfiles