add file
delete file

Merge branch 'master' of https://github.com/tonysilva/foodconsumption

Conflicts:
	data/clean-data.csv
Merge branch 'master' of https://github.com/tonysilva/foodconsumption
update