SetImage removed String Name arg
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/modwiz/ld31/entities/GameBlock.java
Patrol path didn't change for some reason
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/modwiz/ld31/Main.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'