Commit latest work from last time
Merge branch 'master' of github.com:dylanfprice/hutmap