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

author Clyne Sullivan <tullivan99@gmail.com>

Thu, 3 Dec 2015 20:50:23 +0000 (15:50 -0500)

committer Clyne Sullivan <tullivan99@gmail.com>

Thu, 3 Dec 2015 20:50:23 +0000 (15:50 -0500)
author Clyne Sullivan <tullivan99@gmail.com>
Thu, 3 Dec 2015 20:50:23 +0000 (15:50 -0500)
committer Clyne Sullivan <tullivan99@gmail.com>
Thu, 3 Dec 2015 20:50:23 +0000 (15:50 -0500)
diff --cc include/inventory.h
Simple merge
diff --cc src/gameplay.cpp
Simple merge
diff --cc src/inventory.cpp
Simple merge
diff --cc src/ui.cpp
Simple merge
author	Clyne Sullivan <tullivan99@gmail.com>
	Thu, 3 Dec 2015 20:50:23 +0000 (15:50 -0500)
committer	Clyne Sullivan <tullivan99@gmail.com>
	Thu, 3 Dec 2015 20:50:23 +0000 (15:50 -0500)
		1	2
include/inventory.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/gameplay.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/inventory.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui.cpp	patch \|	diff1 \|	diff2 \|	blob \| history