Merge branch 'gh-pages'
Resetting
Merge branch 'master' of https://github.com/escape/escape.github.io

Conflicts:
	index.html