second commit
Merge branch 'master' of https://github.com/joshuascott/joshuascott.github.io
Import of wtftacos