Merge branch 'xy2'
Merge branch 'master' of https://github.com/louisel/chillicrab
Adding serving size
Add serving sizes
Merge branch 'master' of https://github.com/louisel/chillicrab
Remove .idea from git repo
Added search to action bar midway

+Change min sdk version to 4.1
Added search to action bar

Probably doesn't work...
Midway through adding search
Still adding search but it is failing badly
Further attempts to make search display SOMETHING
Got display to start up, errors in building db
Can search, but "no results" always returned
Fixed dumb SQL error
I give up. Lots of logs but dk why not init.
Fixes for fooddata.txt
Search works + displays (but cannot click yet)
out file amendment
changed icon
Merge remote-tracking branch 'origin/xy2' into xinyu