Many Aesthetic Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/shreya/onetouchcoffee/MainActivity.java
	app/src/main/res/drawable-xxhdpi/ic_launcher.png
	app/src/main/res/layout/activity_main.xml