Working on adding image captions ontop of image
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Accidentally deleted possibly important files
Added back application css page
Fixed merge conflicts with nav bar
Pushing somewhat working code, to overwrite crap code
Fixed merge conflicts, fingers crossed this works
Merge pull request #116 from JessicaTatham/master

Pushing somewhat working code, to overwrite crap code