Merge pull request #11 from ZooTypers/master

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

updating local
Merge pull request #12 from ZooTypers/master

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

trying out login popup
Merge pull request #13 from ZooTypers/master

getting multiplayer ui
ohaiii
adding this extra buggy multiplayer
Tested all of the classes and reached 50%+ coverage!
Merge pull request #76 from dyxliang/master

Pull update.
Commenting out some test method for jenkins.
Merge pull request #77 from dyxliang/master

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

pull
Merge pull request #12 from ZooTypers/master

pul
commiting some changes so that ring can see it.
Merge pull request #14 from nhlien93/master

debugging getting same words list on two players
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 #13 from ZooTypers/master

update
Merge pull request #15 from ZooTypers/master

testing to see if pulling master will work
adding gen folder