pre-merge
pre-merge
Merge branch 'master' of github.com:slifty/gunshow
intro works, booth fullscreen