Slight updates
Merging
revert
merging
Merge branch 'Stanley' of github.com:stuycs-softdev/proj2-pd6-05-FunThingsAreFun into Stanley