ck task
local compile to push
Merge branch 'master' of github.com:xguox/fotofo
somenthing left
Merge branch 'master' of heroku.com:do4fun
Merge branch 'master' of github.com:xguox/fotofo
ready for push heroku
heroku local compile
Merge branch 'master' of heroku.com:do4fun

Conflicts:
	public/assets/manifest-981b2ec4f8133fce1c10353d28cdb880.json
ck task
local compile to push
somenthing left
ready for push heroku
ready to heroku
Merge branch 'master' of heroku.com:do4fun

Conflicts:
	public/assets/manifest-981b2ec4f8133fce1c10353d28cdb880.json
Merge branch 'master' of github.com:xguox/fotofo
Merge branch 'master' of github.com:xguox/fotofo
Merge branch 'master' of github.com:xguox/fotofo
compile
Merge branch 'master' of github.com:xguox/fotofo