deleted:    app/views/messages/_form.html.erb
	deleted:    app/views/messages/new.html.erb
	deleted:    app/views/posts/_form.html.erb
	deleted:    app/views/posts/_sidebar.html.erb
	deleted:    app/views/posts/categorized.html.erb
	deleted:    app/views/posts/edit.html.erb
	deleted:    app/views/posts/index.html.erb
	deleted:    app/views/posts/index.json.jbuilder
	deleted:    app/views/posts/new.html.erb
	deleted:    app/views/posts/show.html.erb
	deleted:    app/views/posts/show.json.jbuilder
	deleted:    app/views/posts/tagged.html.erb
	deleted:    app/views/services/index.html.erb
	deleted:    app/views/services/show.html.erb
	deleted:    app/views/welcome/about.html.erb
	deleted:    app/views/welcome/contact.html.erb
	deleted:    app/views/welcome/index.html.erb
Merge remote-tracking branch 'upstream/master'
fix upstream