I forgot what I did
Merge branch 'master' of https://github.com/conradhappeliv/grubeez

Conflicts:
	templates/index.tpl