Did some stuff
Merge branch 'master' of https://github.com/jennyallen/diybootcamp