props
adding new images and change image sizes
Merge branch 'david' into temp
Merge branch 'tyler' into temp
Merge branch 'temp' of https://github.com/tylerl0706/CoffeeSim into temp

merge
Merge branch 'marshall' into temp
buttons and speech bubble