Merge branch 'master' into Hannah
tastes are fixed
tastes fized
Merge branch 'master' of https://github.com/cs327/WordSnack