Fixing user controller
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Tabling inspire feature for now
Merge branch 'master' of https://github.com/cicadas-2014/Embark
add category filtering
Merge branch 'master' into add_category_filter
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
Moved inspire me feature to the bottom of the page and added quote
Fixed merge conflict with the category filter
Merge pull request #149 from JessicaTatham/master

	Moved inspire me feature to the bottom of the page and added quote
Merge branch 'master' of https://github.com/cicadas-2014/Embark
added singup/signout/account/logout to nav bar