commit msg
Merge branch 'master' of https://github.com/karthik-shanmugam/gitTest

Conflicts:
	test.py

merged an added princess