fix roses oopsies

CHANGELOG.md

@@ -4,9 +4,13 @@ All notable changes will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [UNRELEASED]
+## [0.2.7] - 2021-02-02
 ### Added
-- Rebindable controls ([Thanks to PKPenguin321 for the menu backbone work](https://github.com/ninjamuffin99/Funkin/pull/288))
+- PIXEL DAY UPDATE LOL 1 WEEK LATER
+- 3 New songs by Kawaisprite!
+- COOL CUTSCENES
+- WEEK 6 YOYOYOYOY
+- Swaggy pixel art by Moawling!
 ### Changed
 - Made it so you lose sliiiightly more health when you miss a note.
 - Removed the default HaxeFlixel pause screen when the game window loses focus, can get screenshots of the game easier hehehe

README.md

@@ -29,8 +29,11 @@ IF YOU WANT TO COMPILE THE GAME YOURSELF, CONTINUE READING!!!
 First you need to install Haxe and HaxeFlixel. I'm too lazy to write and keep updated with that setup (which is pretty simple). 
 The link to that is on the [HaxeFlixel website](https://haxeflixel.com/documentation/getting-started/)
 
+<<<<<<< HEAD
 That should give you HaxeFlixel and all of it's setup and shit. If you run into issues INSTALLING FLIXEL, ask them in the #flixel channel in the Haxe Discord server: https://discord.gg/5ybrNNWx9S
 
+=======
+>>>>>>> b64a14af64424954a704712c977754049eb544cc
 Other installations you'd need is the additional libraries, a fully updated list will be in `Project.xml` in the project root, but here are the one's I'm using as of writing.
 
 ```

source/GameOverSubstate.hx

@@ -23,7 +23,7 @@ class GameOverSubstate extends MusicBeatSubstate
 			case 'school':
 				stageSuffix = '-pixel';
 				daBf = 'bf-pixel-dead';
-			case 'school-evil':
+			case 'schoolEvil':
 				stageSuffix = '-pixel';
 				daBf = 'bf-pixel-dead';
 			default: