fixed Oak-Birch wood mixup. Logs = right planks.
craft quartz to columns and chiseled
Merge branch 'master' of git://github.com/ronmurphy/Minecraft

Conflicts:
	globals.py
	main.py
	model.py
	player.py