merge
Merge branch 'master' of github.com:vnavkal/test-script

Conflicts:
	test_script.rb