Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ShakeAndTiltListener/src/com/example/shakeandtiltlistener/MyClassAdded.java
hai laxmi donefirst git commit
Merge branch 'master' of
ssh://git@github.com/prudhvireddy123/ShakeAndTiltListener.git