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
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