new edits
Merge branch 'master' of https://github.com/dredlong/dredlong.github.io