Multiple types of Pieces
Merge branch 'master' of https://github.com/sboerwinkle/yolo-happiness

Conflicts:
	main.cpp