added .env file to root and gitignore
fixed merge conflict in Gemfile.lock
Merge pull request #1 from lauyeung/fix_gemfile_lock

Fix gemfile lock