add meals showing
Merge branch 'master' of https://github.com/TrevorDev/smartEats

Conflicts:
	public/custom/css/main.css