fail
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/shreya/onetouchcoffee/MainActivity.java
Merge branch 'master' of https://github.com/svkhadke/OneTouchCoffee