merged both files
Merge branch 'master' of https://github.com/kkanojia/hellogame
merged files