Merge branch 'master' of github.com:kwasniew/healthy-front-page

Conflicts:
	healthy-front-page/views/index.hjs
the grid
Merge branch 'master' of github.com:kwasniew/healthy-front-page