Merge pull request #1 from ZooTypers/master

update
Merge pull request #2 from ZooTypers/master

update
Merge pull request #3 from ZooTypers/master

oakpull
Merge pull request #4 from ZooTypers/master

oakpull
c
ignore
c
Merge pull request #9 from ZooTypers/master

Getting updates.
Merge pull request #10 from ZooTypers/master

Getting updates.
Merge pull request #11 from ZooTypers/master

Getting updates.
Merge pull request #10 from ZooTypers/master

fixing first word bug
fixed bug where windows computers would still parse \r resulting in
words not disappearing from screen
Merge pull request #52 from winglam/master

fixed bug where windows computers would still parse \r resulting in words not disappearing from screen
Merge pull request #12 from ZooTypers/master

Getting updates.
Fixed the back button issues of going to incorrect screens.
Merge pull request #53 from dyxliang/master

Fixed back button issues of going to incorrect screens.
Merge pull request #11 from ZooTypers/master

updating with davids change for back button
Merge pull request #6 from ZooTypers/master

oakpul
home screen pause and back button pause now all works
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers

Conflicts:
	ZooTypers/res/layout/activity_single_player.xml
	ZooTypers/res/values/strings.xml
	ZooTypers/src/com/example/zootypers/SinglePlayer.java