:xmore css
fix merge conflict
Merge pull request #1284 from ahomatthew/projects/jnap

Projects/jnap
Merge branch 'projects/jnap' of github.com:sightmachine/SimpleSeer into projects/jnap