commiting to pull
Merge branch 'master' of https://github.com/gbc1230/downcityjs
Merge branch 'master' of https://github.com/gbc1230/downcityjs
Merge branch 'master' of https://github.com/gbc1230/downcityjs
more changes to front end