modified:   Gemfile.lock
	modified:   log/production.log
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3
Merge branch 'master' of https://github.com/simontaosim/fancyshop_0.3