Merge pull request #1 from ZooTypers/master

Getting the most recent copy of the UI.
Merge pull request #2 from ZooTypers/master

Testing getting James' files.
Looking over code.
Merge pull request #3 from ZooTypers/master

Pull new UI.
Changing .gitignore back. (Don't ignore .apk file)
Testing committing the Android APK.
Update .gitignore
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git
Merge pull request #4 from ZooTypers/master

Update
Code review and comments for Model.
Fixed model bug.
Merge pull request #19 from dyxliang/master

Looked over model for code review and comment; fixed small logic bug.
"finished softkey necessities, need types to be able to initialize model instance to start single player game"
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