First; much to do
Merge branch 'master' of https://github.com/bcairl01/tank