Merge pull request #1 from ZooTypers/master

files kthxbai
Merge pull request #1 from ZooTypers/master

pulling to see new code
Merge pull request #2 from ZooTypers/master

getting new updates
Merge pull request #2 from ZooTypers/master

updating repo
Merge pull request #3 from ZooTypers/master

getting updates
this is for wing
Merge pull request #3 from nhlien93/master

getting lindseys changes
wordsList is now properly parsed
Merge pull request #4 from winglam/master

getting the correctly parsed list
correct words are displayed and word list is shuffled.
Merge pull request #33 from nhlien93/master

Correct words are being displayed on the single player screen initially and you can shuffle the words list beforehand.
Merge pull request #3 from ZooTypers/master

pull update
got the words to only be chosen if none of the other words' first
letter is the same letter. (somewhat tested but needs to be tested once
words can be typed)
fixed it up a little to make it better.
fixed image sizing & made difficulty work
Merge pull request #34 from cdallas/master

fixed image sizing & made difficulty work
done with words i think. changed implementation to use a set
pushing stuff
Merge branch 'master' of https://github.com/littlpunk/ZooTypers into littlpunk-master

Conflicts:
	ZooTypers/bin/ZooTypers-git.apk
	ZooTypers/src/com/example/zootypers/SinglePlayer.java
Merge branch 'master' of https://github.com/ZooTypers/ZooTypers into ZooTypers-master

Conflicts:
	ZooTypers/src/com/example/zootypers/SinglePlayer.java