4 Commits

Author	SHA1	Message	Date
Susan Quigley	49ec328dc1	132 Conflict Error - Corrected	2019-07-29 20:24:43 +00:00
Henry Whitney	af12946cd8	Conform file to have EOL at end	2019-06-13 12:08:18 -04:00
SusanQuigley	555b1d7c02	Corrected SmartQuotes	2019-06-10 16:28:09 -04:00
David Statezni	bb353c59d2	Update merge conflicts	2019-02-05 09:38:00 -07:00