edits
Merge branch 'gh-pages' of github.com:rdwilliams93/guardian-project into gh-pages