stashing
stashing
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014
fixed burned stones
stashing
Merge pull request #48 from Kierz/master

fixed burned stones
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems