Merge branch 'master' of https://github.com/tcsullivan/gamedev

author drumsetmonkey <abelleisle@roadrunner.com>

Mon, 2 May 2016 11:36:43 +0000 (07:36 -0400)

committer drumsetmonkey <abelleisle@roadrunner.com>

Mon, 2 May 2016 11:36:43 +0000 (07:36 -0400)
author drumsetmonkey <abelleisle@roadrunner.com>
Mon, 2 May 2016 11:36:43 +0000 (07:36 -0400)
committer drumsetmonkey <abelleisle@roadrunner.com>
Mon, 2 May 2016 11:36:43 +0000 (07:36 -0400)
diff --cc src/inventory.cpp
Simple merge
diff --cc src/ui.cpp
Simple merge
author	drumsetmonkey <abelleisle@roadrunner.com>
	Mon, 2 May 2016 11:36:43 +0000 (07:36 -0400)
committer	drumsetmonkey <abelleisle@roadrunner.com>
	Mon, 2 May 2016 11:36:43 +0000 (07:36 -0400)
		1	2
src/inventory.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui.cpp	patch \|	diff1 \|	diff2 \|	blob \| history