Merge pull request #2 from Make-Magazine/master

Merge all of the Maker Camp stuff into Master