www
Merge branch 'master' of github.com:Yipinuu/departures

Conflicts:
	app/views/posts/show.html.erb
	app/views/posts/show.html.erb~
	config/application.rb
	db/schema.rb