Notice that this branch isn't used ...
Merge branch 'gh-pages'

Conflicts:
	README.md
	index.html
Merge remote-tracking branch 'upstream/gh-pages'
Tools page (fixes #14)
Merge pull request #16 from comzeradd/master

Tools page