change
Merge branch 'master' of https://github.com/Hitarth2000/Demo2

Conflicts:
	Demo2/en.lproj/ViewController.xib
change