data updated
ok
comit
ok
Merge branch 'master' of https://github.com/sibasamal87/Game.git

Conflicts:
	GitDemoTest/src/com/pnest/gitdemotest/MainActivity.java
sfd
Merge branch 'master' of https://github.com/sibasamal87/Game.git
Merge branch 'master' of https://github.com/sibasamal87/Game.git
ok
Merge branch 'master' of https://github.com/sibasamal87/Game.git

Conflicts:
	GitDemoTest/src/com/pnest/gitdemotest/MainActivity.java