party time fixes
Merge branch 'master' of github.com:nycresistor/Future-Crew