IDE stuff
Merge remote-tracking branch 'origin/Aisha'
added gitignore
changed gitignore
mock 'add meal' data
added libs
add meal popup with limited data; no search,favorites,recent
reordered add meal list to be alphabetical
fixed .gitignore, added v4 lib
added summary view, working on history
actually added summary
attempting to get spinner working in popup
Added date to meal adder
removed workspace.xml and apk files from tracked list
fixed merge conflict
fixed merge conflict