changes arun!!!!! 4:40
merged code with hamshan!!!!!4:42
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hello/bin/classes/com/example/hello/MainActivity.class
	Hello/src/com/example/hello/MainActivity.java