Fixing errors
error commit
Merge branch 'master' of https://github.com/rohandalvi/requiredCustomScripts

Conflicts:
	custom_script.rb