basic functionality done 2, CSS partly done
Merge remote-tracking branch 'upstream/master'
update cookbook
Merge pull request #173 from paulvarga23/master

cookbook has many through update