Merge branch 'change2' into change1

Conflicts:
weblog/app/views/posts/new.html.erb