6 Commits

Author	SHA1	Message	Date
David Statezni	4ba3900ea1	Resolve merge conflict with Tabitha branch	2019-02-05 10:31:05 -07:00
David Statezni	4c3ac44f11	Get a clean Master	2019-02-05 10:27:11 -07:00
David Statezni	bb353c59d2	Update merge conflicts	2019-02-05 09:38:00 -07:00
Richard Mahn	41fc5f6386	Standardized indentation of all bullets	2017-06-28 14:55:25 -06:00
Joel Lonbeck	ba770a6df0	changed RC links to relative links	2017-05-05 10:59:12 -07:00
Joel Lonbeck	d12a284072	combined tA into RCs	2017-04-14 16:13:59 -07:00