Merge branch 'master' of https://github.com/gang-of-7/path-to-smoke-in-rotterdam-web
change design