okay w/e
Merge branch 'master' of https://github.com/dpett122/dpcom

Conflicts:
.index.html.swp
conflict resolved yo
Merge branch 'master' of https://github.com/dpett122/dpcom