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