Started names and genders

author drumsetmonkey <abelleisle@roadrunner.com>

Wed, 30 Sep 2015 12:50:49 +0000 (08:50 -0400)

committer drumsetmonkey <abelleisle@roadrunner.com>

Wed, 30 Sep 2015 12:50:49 +0000 (08:50 -0400)
author drumsetmonkey <abelleisle@roadrunner.com>
Wed, 30 Sep 2015 12:50:49 +0000 (08:50 -0400)
committer drumsetmonkey <abelleisle@roadrunner.com>
Wed, 30 Sep 2015 12:50:49 +0000 (08:50 -0400)
diff --cc include/entities.h
Simple merge
diff --cc src/entities.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
author	drumsetmonkey <abelleisle@roadrunner.com>
	Wed, 30 Sep 2015 12:50:49 +0000 (08:50 -0400)
committer	drumsetmonkey <abelleisle@roadrunner.com>
	Wed, 30 Sep 2015 12:50:49 +0000 (08:50 -0400)
		1	2
include/entities.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/entities.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history