Changed the template
Merge branch 'master' of https://github.com/Sebasdc/LunchTime

Conflicts:
	app/views/layouts/base.blade.php
	public/css/css.css
Merge branch 'master' of https://github.com/Sebasdc/LunchTime