no message
Merge branch 'master' of https://github.com/smilesuhas/NewAndroidTraining

# Via Suhas Maskar (1) and smilesuhas (1)
* 'master' of https://github.com/smilesuhas/NewAndroidTraining:
  no message

Conflicts:
	TipCalculator/bin/TipCalculator.apk
	TipCalculator/bin/classes.dex
	TipCalculator/bin/classes/com/codepath/example/tipcalculator/MainActivity$1.class
	TipCalculator/bin/classes/com/codepath/example/tipcalculator/MainActivity$2.class
	TipCalculator/bin/classes/com/codepath/example/tipcalculator/MainActivity.class
	TipCalculator/src/com/codepath/example/tipcalculator/MainActivity.java