add env.txt
change env.txt test conflict
fishing
fix conflict
add gitignore
Merge branch 'dev'