Merge remote-tracking branch 'upstream/master' into patch-3

source/FreeplayState.hx

@@ -58,6 +58,8 @@ class FreeplayState extends MusicBeatState
 	{
 		var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist'));
 
+		//var diffList = "";
+
 		for (i in 0...initSonglist.length)
 		{
 			var data:Array<String> = initSonglist[i].split(':');
@@ -80,6 +82,8 @@ class FreeplayState extends MusicBeatState
 			}
 		}
 
+		//trace("\n" + diffList);
+
 		/* 
 			if (FlxG.sound.music != null)
 			{

source/PlayState.hx

@@ -1631,17 +1631,6 @@ class PlayState extends MusicBeatState
 				swagNote.sustainLength = songNotes[2];
 				swagNote.scrollFactor.set(0, 0);
 
-				var addNote = false;
-
-				for (i in unspawnNotes)
-					if (i.strumTime == daStrumTime && i.noteData == daNoteData)
-						addNote = true;
-
-				if (addNote)
-				{
-					trace('stacked note, thats cringe');
-					continue;
-				}
 
 				var susLength:Float = swagNote.sustainLength;