New blocks, yay!
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/mapdata/map02.txt