Charge Shot
Revert "Charge Shot"

This reverts commit 56bc253573b752079aacafbace07a0b95602ff4f.
Merge branch 'dev' into jeffServeDev

mit 56bc253573b752079aacafbace07a0b95602ff4f.
Changes to charge shot and serving
End of round stuff
Delayed Serve works!
Cleanup
Changes
Fixed merge conflict
Fixed conflict
Revert "Changes"

This reverts commit f68713f51a8376e8d13c1524051bd89965ff77b0.
Revert "Cleanup"

This reverts commit 18b92f4e804061e4ceb428dc4d10f707d92e477d.
Delayed Serving working
New Stuff
Fixing merge conflicts
Final merge
Merge pull request #69 from Murkantilism/jeffServeDev

Jeff serve dev