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