pkupdated
Merge branch 'master' of github.com:axenictech/ruby-programming

Conflicts:
	prateema/16_july_14/mymodule.rb~
	prateema/19_july_2014_prateema/connection.rb
	prateema/21_july_14/connection_dbi.rb
	prateema/22_july/example.rb
	prateema/22_july/pg.rb
	prateema/22_july/ruby Quiz~
	prateema/23_july_2014/Flight_book.rb
	prateema/25_july/Flight_book.rb
	prateema/26_july_2014/password.rb
	prateema/file ruby rails
prateema_updated