Fix merge conflict#87

Open

briturgott wants to merge 2 commits into

FuadBalashov:masterfrom

briturgott:fixMergeConflict

Commits on Mar 10, 2018

brianna information added

Brianna Turgott
authored and
Brianna Turgott
committed
fixing a bug

Brianna Turgott
authored and
Brianna Turgott
committed