added int x
nnew changes
Merge branch 'master' of https://github.com/petronela0306/Demo.git

Conflicts:
	DemoApp/bin/classes/.gitignore
	DemoApp/bin/classes/com/example/demoapp/MainActivity.class
	DemoApp/src/com/example/demoapp/MainActivity.java