uh..
just trying to merge conflicts
Merge branch 'master' of https://github.com/chasestice/crossroads
fixed some json and css