Merge pull request #1 from ZooTypers/master

update
updated navigation, added postgame screen, passed animal & bg between
screens
manual merge PreGame
Merge pull request #24 from oaknguyen/master

softkey
merge
Merge branch 'master' of https://github.com/cdallas/ZooTypers into cdallas-master

Conflicts:
	ZooTypers/AndroidManifest.xml
	ZooTypers/src/com/example/zootypers/PreGameSelection.java
Merge branch 'cdallas-master'

merge changes to PreGame - proper color use & goes to post game
merge renames
Merge pull request #22 from cdallas/master

more navigation; made postgame screen; animal & bg passed between screens
small fix to pregame buttons
Merge pull request #25 from cdallas/master

pregame button fix
button highlighting fix
Merge pull request #27 from cdallas/master

buttons highlight correctly
Merge pull request #2 from ZooTypers/master

pulling master
checkstyle for pre-, post-game, options, leaderboard, title page
Merge pull request #29 from cdallas/master

checkstyle corrections
Merge pull request #1 from ZooTypers/master

update