Clearing Code
Merge branch 'master' of https://github.com/Zcial/ChefColombia

Conflicts:
	css/style.css
	js/functions.js