New achievement Author (Level 5)
Merge branch 'gh-pages' of https://github.com/christopherkeller/git-achievements into gh-pages

Conflicts:
	index.html
	index.rss