Merge pull request #2 from GeoffPurdy/master

fixed merge problem in application.html.erb