on click highlight-- still need to fix image sizing
highlighting
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/shreya/onetouchcoffee/MainActivity.java