Merge pull request #23 from ZooTypers/master

getting new updates.
Merge pull request #24 from ZooTypers/master

getting updates so that i can comment the code
Merge pull request #25 from ZooTypers/master

pulling again
commenting model and UI activities
Merge pull request #134 from nhlien93/master

pushing comments up to master
Merge pull request #24 from ZooTypers/master

pulling lindseys changes
last commit for phase2, fixes the login popup crashes
Merge pull request #136 from winglam/master

 last commit for phase2, fixes the login popup crashes
committing apk
Merge pull request #137 from winglam/master

committing apk!
Merge pull request #1 from ZooTypers/master

update me