Merge pull request #2 from Make-Magazine/master

Merge all of the Maker Camp stuff into Master
Merge pull request #3 from Make-Magazine/maker-camp

Merge pull request #2 from Make-Magazine/master