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 #6 from ZooTypers/master

oakpul
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
Merge pull request #7 from ZooTypers/master

okapul
Finish error
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers
Merge pull request #55 from dyxliang/master

Finalized Phase 2 for turn-in.
Merge pull request #56 from oaknguyen/master

Finished invalid typed letter error w/ beep sound
Update .gitignore
Merge pull request #15 from ZooTypers/master

Getting updates.