Added some conditionals for goal buttons
Merge branch 'master' of https://github.com/VoltronForceV/attaboy