Merge pull request #15 from andreqi/master

update jc
Merge pull request #16 from andreqi/pre_launch_fix

group by tag, redirect from base URL, a nada xD
Merge pull request #17 from andreqi/jc

Merge pull request #15 from andreqi/master
Merge pull request #18 from andreqi/master

update jc
nuevos restaurantes
carta opcional
more updates on data
da gusto update
Merge pull request #19 from andreqi/jc

nuevos restaurantes
Merge remote-tracking branch 'origin/master' into pre_launch_fix

Conflicts:
	restaurants/dona-victoria/banner.jpg
	restaurants/el-tio-bigote/banner.jpg
	restaurants/full-sanguchon/info.yml
	restaurants/tio-bigote/banner.jpg
	views/footer.html