Merge branch 'master' of http://git.huxiukeji.com/lizhen/lanjingling

.gitignore

@@ -4,4 +4,6 @@
 /nginx.htaccess
 /public/nginx.htaccess
 /runtime/*
-/public/uploads/*
+/public/uploads/*
+.env.sample
+.env