Cleaned up the repo some
Merge branch 'gh-pages' of https://github.com/PHIConflictAssignment/Conflict into gh-pages