changed images
mergeMerge branch 'master' of https://github.com/shirotokuro/cs145