Merge map-generator and ActorManager branches into master

CS 4096-97 Top Down Game/.mono/metadata/ide_messaging_meta.txt

+58046
+C:\Users\Username\Desktop\Godot_v3.2.3-stable_mono_win64\Godot_v3.2.3-stable_mono_win64.exe

CS 4096-97 Top Down Game/actors/Player.gd

@@ -21,7 +21,7 @@ func _ready():
 # use this if you want to only move on keypress
 func _unhandled_input(event):
 	for dir in inputs.keys():
-		if event.is_action_pressed(dir) and (get_node("../TurnManager/ActionManager").currActor == "Player"):
+		if event.is_action_pressed(dir) and (get_node("../../TurnManager/ActionManager").currActor == "Player"):
 			if dir != direction:
 				if dir == "right":
 					get_node(texture_node).set_flip_h(false)