try to merge.. :s
Merge branch 'master' of https://github.com/matthiasdeckx/MAIV_FOOD

Conflicts:
	src/css/screen.css
	src/index.html