johoo
Merge branch 'master' into Roamer

Conflicts:
	Hidiho.txt