env variables fixed
Merge branch 'lab2'