add filter category wip
Merge branch 'master' into add_category_filter
Merge pull request #145 from DineshRai/add_category_filter

Add category filter
changed some graphixxxxx
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
changed 3rd page
add category filtering
login is now working, topnav changing to account when logged in
Merge branch 'master' into add_category_filter
Merge pull request #146 from jasonMatney/jason

increased size of loading gif and removed blue header on 3rd page
Merge branch 'master' into add_category_filter
Merge pull request #147 from LasseSviland/master

login is now working, topnav changing to account when logged in
fix merge conflicts
Merge pull request #148 from DineshRai/create_category_filter

Create category filter
Fixed merge conflict with the category filter