working spoon
Merge remote-tracking branch 'origin/master'

Conflicts:
	SoupforTim/src/main/java/com/example/soupfortim/MainActivity.java
	SoupforTim/src/main/res/layout/activity_main.xml