* header del
Merge branch 'master' of https://github.com/tansky/actiguide

Conflicts:
	grid.html