Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ShakeAndTiltListener/src/com/example/shakeandtiltlistener/MyClassAdded.java
prudhvi added another method
We added one more class