*
Merge branch 'master' of https://github.com/davidprea/secret-batman

Conflicts:
	tor-sheet.html