edits
Merge branch 'master' of https://github.com/joshuaar/joshuaar.github.com