Merged my changes
Merge branch 'master' of github.com:th3brink/the-life-of-text