Merge branch 'master' of github.com:StartupWeekend/startup-week-base into upstream