Mostly merged css/html
Merged
Merge branch 'master' of https://github.com/manur/ksl-sinatra