Tauka commit

Made sure that everything works. I didn't put in all my past edits because something apparently
didn't want to work when I did. I know what I have to look at so nothing wrong there
Merge branch 'local-branch'

Conflicts:
	terrastation.dmb
	terrastation.rsc