New Conflict
Conflict fixes
Merge branch 'master' into Roamer2

Conflicts:
	Hidiho.txt
Merge pull request #4 from Merglasch/Roamer2

Roamer2