Build env unnecessary
Conflict
Merge pull request #7 from connor4312/merge

Merge