what
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
css
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
treid tofix button
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
i haz changes
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
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #154 from LasseSviland/master

removed curb gem
Fixed merge conflict on adventure display page