Merge https://github.com/kanzure/pokered

Conflicts:
	extras
	main.asm