add header
Fix header conflict
Merge branch 'master' of https://github.com/fmorrow/ardularm
Some mild refactoring