adding divs
Merge branch 'master' into development
styling categories
done styling