dummy commit
merged into local machine
merged strings.xml and AndroidManifest.xml to local
Started defining add entry activity
few styling things done on the spinner and list
pulled master in origin
merged the login stuff to the addentry branch
added all the necessary fields for entries
Merge branch 'master' of https://github.com/coldstar96/cse403
added a new file for strings associated with add entry
merged with main
finished implementing addEntryActivity with mock actions/layout
finished implementing addEntryActivity with mock actions/layout
fixed manifest to start with login
added colors.xml and removed hello world from resources
fixed indentation in AddEntryActivity and fixed the comment on strings_add_entry
deleted activity_main
Merge branch 'master' of https://github.com/coldstar96/cse403
Merge branch 'master' into addEntry

Conflicts:
	AndroidManifest.xml