by hk
Merge branch 'master' of https://github.com/gurgaon/Noida

Conflicts:
	Hello.C