Merge branch 'Monster-Update-6' into chapter-5-choreo

# Conflicts:
#	game/script.rpy
#	game/script/1.first-two-days-anon-meets-fang.rpy
#	game/script/2.fourth-day-of-school.rpy
#	game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy

game/script/1.first-two-days-anon-meets-fang.rpy

@@ -359,7 +359,7 @@ label chapter_1:
 
     N "I had this prepared just for you!"
 
-    show anon neutral flip 
+    show anon neutral flip
     show naomi neutral
     with dissolve
     pause .25
@@ -437,7 +437,7 @@ label chapter_1:
 
     N "ahem"
 
-    show anon neutral flip 
+    show anon neutral flip
     show naomi neutral
     with Dissolve(.25)
 
@@ -656,7 +656,7 @@ label chapter_1:
 
     pause 0.5
     "{cps=*.2}Yay me.{/cps}"
-    
+
     scene black with fade
 
     # SCENE UPDATED
@@ -741,7 +741,7 @@ label chapter_1:
 
 
     I "I stand from my seat and face the class.{w=0.5} Once again all eyes on me and the tightness in my chest returns.{w} I inhale deep,{w=0.3} willing my erratic heart to slow."
-    
+
     $ renpy.music.set_volume(0.3, 0, 'ambient1')
     play ambient1 'audio/effects/heartbeat.ogg' fadein 4
 
@@ -782,7 +782,7 @@ label chapter_1:
     A "uh{cps=*0.2}...{/cps}{w=0.4} I{cps=*0.2}...{/cps}"
 
     I "There’s whispers now.{w} The hushed tones,{w=0.3} silenced snickers,{w=0.3} blending with the everpresent stares."
-    
+
     I "My heart hammers at my chest and I am sure that they all can hear it.{w=0.5} See the cold chill racing over me."
 
     show dimmer_darker behind anon, jinflip with dissolve
@@ -871,7 +871,7 @@ label chapter_1:
 
     $ renpy.music.set_volume(1, 1, 'ambient')
     hide dimmer_light with dissolve
-    
+
     show anon sad flip behind naser with Dissolve(0.25)
     pause 0.75
 
@@ -1022,7 +1022,7 @@ label chapter_1:
 
     show naomi explanatory flip:
         easein 0.4 xalign 0.9
-    
+
     N "Hey!{w=0.4} Don’t leave me out of the conversation!"
 
     show naomi happy flip with dissolve
@@ -1472,7 +1472,7 @@ label chapter_1:
 
     show anon:
         easein_quad 0.5 xalign 0.825
-    pause .5 
+    pause .5
 
     A "Seriously?"
 
@@ -1486,7 +1486,7 @@ label chapter_1:
 
     Nas "Look,{w=0.5} whatever happens{w=0.3} promise you won’t hold this against them."
 
-    Nas "They're actually a really a nice person once you get to know them"
+    Nas "They're actually a really nice person once you get to know them"
     pause 0.6
 
     A "Naser why did you just murder the english language in cold blood?"
@@ -1524,7 +1524,7 @@ label chapter_1:
     I "I’m just getting thrown around today.{w=0.5} I don’t know."
 
     I "She looks familiar."
-    
+
     stop ambient fadeout 1
     pause 1.0
 
@@ -1540,7 +1540,7 @@ label chapter_1:
     pause .5
     play music 'audio/OST/its_the_piece_of_shit_you_asked_for.ogg' volume 1
     with hpunch
-    pause 2 
+    pause 2
 
     I "What I thought was a guitar sounded horrifically wrong,{w=0.5} far too heavy."
 
@@ -2213,7 +2213,7 @@ label chapter_1:
     Re "Bro,{w=0.4} you’ve known I’m in a band for like,{w=0.4} a year now."
 
     show reed neutral flip
-    
+
     pause 0.7
     show naomi angry:
         easein 0.25 xalign 0.1
@@ -2963,14 +2963,14 @@ label chapter_1:
     menu:
 
         "Grab the cookies you fatass":
-            
+
             pass
 
         "That sandwich looks good":
 
             pass
 
-    pause .5      
+    pause .5
     I "Why not both?"
 
     I "Hence my tray stacked high with desserts and the tastiest looking sandwich from the lunchline."
@@ -3121,7 +3121,7 @@ label chapter_1:
 
     show naser:
         linear 0.2 xalign .7
-    
+
     pause .7
     I "{i}I realize now that I had been laughing with them.{/i}"
     pause .5