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

author drumsetmonkey <abelleisle@roadrunner.com>

Fri, 25 Nov 2016 23:46:42 +0000 (18:46 -0500)

committer drumsetmonkey <abelleisle@roadrunner.com>

Fri, 25 Nov 2016 23:46:42 +0000 (18:46 -0500)
author drumsetmonkey <abelleisle@roadrunner.com>
Fri, 25 Nov 2016 23:46:42 +0000 (18:46 -0500)
committer drumsetmonkey <abelleisle@roadrunner.com>
Fri, 25 Nov 2016 23:46:42 +0000 (18:46 -0500)
diff --cc src/ui.cpp
Simple merge
diff --cc src/world.cpp
Simple merge
author	drumsetmonkey <abelleisle@roadrunner.com>
	Fri, 25 Nov 2016 23:46:42 +0000 (18:46 -0500)
committer	drumsetmonkey <abelleisle@roadrunner.com>
	Fri, 25 Nov 2016 23:46:42 +0000 (18:46 -0500)
		1	2
src/ui.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/world.cpp	patch \|	diff1 \|	diff2 \|	blob \| history