Revert "Merge with Master"

Reverts monicaedavidson/finalproject#37