todo, concept, gemfile, html5 layout
merge