Clearing commented out code and bringing back ad block 2
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire