3 Commits (f6f0d91ae71dfc7a52e7d38da143d42dc357340a)

Author	SHA1	Message	Date
Allen Webster	f6f0d91ae7	Better merge logic for character insertion	2019-02-08 04:33:43 -08:00
Allen Webster	2efff76023	first pass merge	2019-02-08 03:18:48 -08:00
Allen Webster	0482cd05fe	Basics of new history system working:	2019-02-08 02:03:48 -08:00