Merge pull request #183 from K-McK/master

Sync up before state championships
did some doxigen stuff
cleaning up comments in code
Merge pull request #31 from pstephen43/master

sync up
resolving merge conflicts
added more doxigen stuff
Merge pull request #185 from PJTNT11/master

sync up
State edits
Merge pull request #191 from PJTNT11/master

State edits
compile issue
Merge pull request #31 from pstephen43/sr_dev

Sr dev