Merge branch 'UI_Built_In_Options'

Conflicts:
	.idea/workspace.xml
	KitchenSync.iml
	res/layout/main.xml
	res/values/colors.xml
	res/values/strings.xml
	src/main/java/com/example/KitchenSync/Food.java
	src/main/java/com/example/KitchenSync/Meal.java
	src/main/java/com/example/KitchenSync/MyActivity.java
	src/main/java/com/example/KitchenSync/Station.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	new file:   .idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
#	new file:   .idea/libraries/jsoup_1_7_3.xml
#	deleted:    res/drawable-ldpi/bonapplogo.jpeg
#	new file:   res/drawable-ldpi/noglutenicon.png
#	new file:   res/drawable-ldpi/settings.png
#	deleted:    res/drawable-ldpi/sidearrow.jpeg
#	new file:   res/drawable-ldpi/veganicon.png
#	new file:   res/drawable-ldpi/vegetarianicon.png
#	new file:   res/menu/popupmenu.xml
#	deleted:    res/values/day_array.xml
#	modified:   src/main/java/com/example/KitchenSync/Food.java
#	modified:   src/main/java/com/example/KitchenSync/MyActivity.java
#
# Changes not staged for commit:
#	modified:   .idea/copyright/profiles_settings.xml
#	modified:   .idea/misc.xml
#	modified:   .idea/workspace.xml
#	modified:   KitchenSync.iml
#	modified:   src/main/java/com/example/KitchenSync/MyActivity.java
#
Merge branch 'UI_Built_In_Options'

Conflicts:
	.idea/workspace.xml
	KitchenSync.iml
	res/layout/main.xml
	res/values/colors.xml
	res/values/strings.xml
	src/main/java/com/example/KitchenSync/Food.java
	src/main/java/com/example/KitchenSync/Meal.java
	src/main/java/com/example/KitchenSync/MyActivity.java
	src/main/java/com/example/KitchenSync/Station.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	new file:   .idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
#	new file:   .idea/libraries/jsoup_1_7_3.xml
#	deleted:    res/drawable-ldpi/bonapplogo.jpeg
#	new file:   res/drawable-ldpi/noglutenicon.png
#	new file:   res/drawable-ldpi/settings.png
#	deleted:    res/drawable-ldpi/sidearrow.jpeg
#	new file:   res/drawable-ldpi/veganicon.png
#	new file:   res/drawable-ldpi/vegetarianicon.png
#	new file:   res/menu/popupmenu.xml
#	deleted:    res/values/day_array.xml
#	modified:   src/main/java/com/example/KitchenSync/Food.java
#	modified:   src/main/java/com/example/KitchenSync/MyActivity.java
#
# Changes not staged for commit:
#	modified:   .idea/copyright/profiles_settings.xml
#	modified:   .idea/misc.xml
#	modified:   .idea/workspace.xml
#	modified:   KitchenSync.iml
#	modified:   src/main/java/com/example/KitchenSync/MyActivity.java
#
Merge branch 'UI_Built_In_Options'

Conflicts:
	.idea/workspace.xml
Merge branch 'UI_Built_In_Options'

Conflicts:
	.idea/workspace.xml