added collage to main page
some better syntax
css bug fixed
css bug fixed
css bug fixed & cook view
merge
solved some typo
another typo resolved
Merge branch 'master' of https://github.com/leonidbl91/HommyFood

Conflicts:
	templates/main.html