Created new tileset and map
Re-saved background tileset image
Updated maps... again... and it's still fucked
Merge branch 'ryland' into micah

Conflicts:
	js/pudar.js
Moved torch out of lava.