Merge branch 'master' of http://git.tfgamessite.com/Ekay_Eto/girllife-ecv

locations/food

@@ -59,7 +59,7 @@ if $ARGS[0] = 's_meal':
 	'<center><img src="images/shared/food/food.jpg"></center>'
 	'You happily eat your meal. The portions are fairly small and' 
 
-	act 'Finish':gt $locM, $metkaM
+	if $ARGS[1] ! 'school': act 'Finish':gt $locM, $metkaM
 end
 
 if $ARGS[0] = 'm_meal':

locations/gschool_lunch

@@ -37,7 +37,7 @@ if $ARGS[0] = 'lunch':
 				money -= 50
 				gs 'gschool_gossip', 'buying'
 				cla
-				gs 'food', 'm_meal'
+				gs 'food', 'm_meal', 'school'
 				act 'Continue your break': gt 'gschool_lunch', 'break'
 			end
 		end