Merge pull request #11 from ZooTypers/master

getting the completed alpha phase
Merge pull request #12 from ZooTypers/master

pulling for updates
Merge pull request #13 from ZooTypers/master

getting multiplayer ui
ohaiii
adding this extra buggy multiplayer
commiting some changes so that ring can see it.
Merge branch 'master' of https://github.com/ZooTypers/ZooTypers

Conflicts:
	ZooTypers/bin/AndroidManifest.xml
Merge pull request #80 from nhlien93/master

merging updates with master
Merge pull request #15 from ZooTypers/master

testing to see if pulling master will work
adding gen folder
Merge pull request #81 from nhlien93/master

pulling gen folder
Using test-driven development approach to test the LeaderBoardModel stub
class/methods with the LeaderBoardTest written beforehand.
Merge pull request #82 from dyxliang/master

Adding the test-driven development test.
Fixing some of my robotium tests.
Changing up tests a bit.
Merge pull request #83 from dyxliang/master

Pull update.
Merge pull request #2 from ZooTypers/master

pull