Delete .gitignore~
Theo added one question dialog box
Merge pull request #16 from tbrockman/master

Theo added one question dialog box
Updated .gitignore
Updated .gitignore
Cleaned up README file
Updated .gitignore
Updated .gitignore
Cleaned up README file
Merge branch 'master' of https://github.com/cchan5/lotsofcodingkitty
Merge pull request #18 from cchan5/master

Updated .gitignore and README
Cleaned up README.md
started work on skeleton login activity
Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty
Updated and cleaned up merge conflicts and added FavoritesTest
Merge pull request #19 from cchan5/master

Updated and cleaned up merge conflicts and added FavoritesTest
Added SearchTest
Added ServerDatabase
Merge pull request #20 from cchan5/master

Added ServerDatabase class and SearchTest
got rid of merge stuff in readme