removed dead code
fixed conflicts
fade toggle on cupboard now functional
fade toggle from shopping list now functional
side nav now updates correctly based on jquery magic
Merge pull request #32 from TheFridge/jquery_magic

Jquery magic