c
ignore
c
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
Finish error
Merge branch 'master' of https://github.com/oaknguyen/ZooTypers