Folding in @bolson's changes
Adding some files
Merge branch 'master' of https://github.com/Make-Magazine/makercon