dummy commit
merged into local machine
Base user login and creation
merged strings.xml and AndroidManifest.xml to local
Finish login and user creation and add a check to see if we're logged in
Merge branch 'master' into api-interface

Conflicts:
	src/com/example/budgetmanager/Entry.java
Undo changes to AndroidManifest.xml
Undo changes to MainActivity.java
Remove old todo comments
Move the cookie store from being an instance variable
Finalify the log TAG
Started defining add entry activity
few styling things done on the spinner and list
Merge branch 'master' into api-interface
pulled master in origin
merged the login stuff to the addentry branch
Merge branch 'master' into api-interface
Merge pull request #19 from coldstar96/api-interface

Api interface: login and user creation
Merge branch 'master' into api-interface
added all the necessary fields for entries