no changes
Resolved the conflict!
Merge branch 'gh-pages' of https://github.com/austincarvey/allstarprojects into gh-pages