added html5-boilerplate gem and ran it
merge conflict in layouts
scaffolding for lists and tasks
changes to add a list