close the div tag that was left open
Merge pull request #10 from tiger-swallowtails-2013/layout-fix

close the div tag that was left open
fix conflicts in application.html.erb