import redis db
updated ignore
Merge branch 'master' of https://github.com/fishsaying/docker_dev
updated nginx docker