Revert "Merge branch 'origin/CS7496'"

This reverts commit ef8e27bcbddba3771f4d0cb5dcd502c4a2a5c0a7, reversing
changes made to 9862a1a2fe64687f943f9b1a10e5e3f777d67381.
Merge branch 'origin/CS7496' (reverted from commit ef8e27bcbddba3771f4d0cb5dcd502c4a2a5c0a7)
edited for project 4