2nd commit

just update
Merge branch 'master' of https://github.com/Aditya8795/Python-1

Conflicts:
	scr_hen.py