resolved merge conflicts
Merge branch 'master' of https://github.com/solstice333/Autom8
Merge branch 'master' of https://github.com/solstice333/Autom8
modified ptb build template