Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3

Conflicts:
	src/dk/itu/mario/level/PCGLevel.java

src/dk/itu/mario/level/PCGLevel.java

@@ -182,9 +182,9 @@ public class PCGLevel extends Level {
 				LevelComponent.TYPE lctype = lcomp.getType();
 				System.out.println("Building for: " + lcomp);
 				switch (lctype) {
-				case FLAT:
-					length += buildStraight(length, lcomp.getEnd(),
-							random.nextBoolean());
+				case FLAT_LO:
+				case FLAT_HI:
+					length += buildStraight(length, lcomp.getEnd(), true);
 					break;
 				case PIPE_JUMP:
 					length += buildPipeJump(length, width - 64 - length);