commit
Merge branch 'master' of https://github.com/18cc/Coursera

Conflicts:
	ProgLang/Ruby/test.rb
hw7 work commit