.
.
Merge branch 'master' into mvc

Conflicts:
	Rakefile
	db/migrate/20131028155930_create_airplanes.rb
	db/schema.rb
	myapp.rb