Fix conflict
Merge branch 'master' of https://github.com/CityKit/24hourstartup