Commitje
Merge branch 'master' of https://github.com/matthiasdeckx/MAIV_FOOD

Conflicts:
	.sass-cache/3f5008fed0cfa4626ed51a3de0cb09c27339f9dd/screen.scssc
	.sass-cache/47bc3e79e5cf428e640b160a6ff691ab3903ebe8/_reset.scssc
	.sass-cache/928717f716b7357483cd89c938a244e1fd7e2fc7/_utilities.scssc
	src/js/main.js
Github stinkt