I'm going through chaaanges
Merge branch 'master' of https://github.com/sagieske/AA1
Started rebuilding env