updated what to ignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
created new recipe page; added recipe data fixtures
changed recipe page title
recipe page corrections
recipe page corrections
Merge branch 'master' of https://github.com/nfqakademija/nomnom