changes to rest data
Merge branch 'master' of https://github.com/evanthebouncy/foodaware.git
Merge branch 'master' of https://github.com/evanthebouncy/foodaware
Add more res pictures, res_data