witnessed the first glimpse of working new firmware
merging...

Merge branch 'master' of https://github.com/jwbowler/maslab-2014