mapupd
#wtfisthis#ididntchangeit#gitwtfurdoing
Merge branch 'master' of https://github.com/Frotty/thwcontest

Conflicts:
	thwcontest.w3x
smexy pathing involved

might fuck up the whole git :S