Basic Player Movement and Camera Follow
Basic Enemy Follow
Added Basic player and enemy

and walls which block the enemies line of sight
quicksave
Merge remote-tracking branch 'origin/develop-ian' into staging

Conflicts:
	Assets/Prefabs.meta
merge complete
Merge remote-tracking branch 'origin/develop-ian' into staging

Conflicts:
	Assets/Prefabs.meta
prefabfix
Basic Combat Implemented
Merge remote-tracking branch 'origin/develop-kyle' into staging

Conflicts:
	Assets/Scenes/default.unity
	ProjectSettings/TagManager.asset
updating
Updating
Fixed?
FIXED!
Merge remote-tracking branch 'origin/develop-ian' into staging

Conflicts:
	Assets/Prefabs/Enemy.prefab.meta
	Assets/Prefabs/TreasureTile.prefab.meta
	Assets/Prefabs/Wall Tile.prefab.meta
	Assets/Prefabs/WallTile.prefab
	ProjectSettings/TagManager.asset
Merge branch 'staging' of https://github.com/Atuuh/Super-Shovel-Saga into staging
Updated from merge
stuff