gm
ho
a
a
aa
Merge branches 'master' and 'hotp'
Merge branch 'master' of https://github.com/piantic/piantic.github.io

Conflicts:
	index.html