PalouseRobosub/robosub — pull request #41 by irwineffect (2014-07-05 01:43:41+00:00)
Title: Merge/logan evans irwinj

@LoganEvans, I merged our two development branches. If you're ok with the changes, please merge.