Display update
Merge branch 'Schmitty'
Merge branch 'Schmitty'
update
Connected Image update
Merge branch 'master' into Schmitty

Conflicts:
	YouShouldProbablyLeave/player/PlayerActor.java