Fixing CSS on filter by category drop down
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Saving some unification of the css
Merge branch 'master' of https://github.com/cicadas-2014/Embark
mad admin page work for city
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #153 from LasseSviland/master

made admin page work for city
Merge pull request #152 from jasonMatney/jason

i haz changes
removed curb gem
ask
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #154 from LasseSviland/master

removed curb gem
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Fiddling with nav bar and unified css to all use the same variables
Fixed merge conflict on adventure display page
Merge pull request #155 from JessicaTatham/master

Fiddling with nav bar and unified css to all use the same variables
haha
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
fixes