Touch ups
Merge remote-tracking branch 'origin/master'

Conflicts:
	CS 320 Project
1/RestaurantGenie/app/src/main/java/com/cs320/restaurantgenie/MainActivity.java