fixed images margin bottom
Add default markup in admin/site/edit
Merge pull request #187 from rono23/add-default-markup

Add default markup in admin/site/edit
Upgrade sinatra, rake and rack
Remove ruby 1.8.7 support
Add ruby2.0 support
Remove waste file
Fix preview
Merge pull request #189 from rono23/fix-preview

Fix preview
Merge pull request #188 from hrysd/remove-waste-file

Remove waste file
Initial commit
Update README.md
Fix link to lokka

%s/komagata/lokka/g
Merge pull request #190 from sanemat/fix/komagata-to-lokka

Fix link to lokka
added session secret to suppress warning.
Merge pull request #192 from lokka/yagi_session_secret

added session secret to suppress warning.
update sass
Merge pull request #193 from is8r/update_sass

update sass
fixed conflicts
changed remote repositry upstream