Adjusted stuff
Merge branch 'master' of https://github.com/CyanRook/OTTDHermes

Conflicts:
	main.nut