before collapse fix
fixed conflicts and added style to category sort
added categories header
Merge branch 'master' of https://github.com/stevenjc/fridgebay