Fixed my gitastrophe

manually merged my changes with Abby's changes.... my bad