Modified Assets structure
Updated scripts
Modified build settings?
Up to date binary
Merge branch 'master' of https://github.com/jothwarr/Project1Zelda

Conflicts:
	project 1/Assets/Resources/Enemies/Resources/Keese.prefab
	project 1/Assets/Resources/Enemies/Resources/OctoProjectile.prefab
	project 1/Assets/Resources/Enemies/Resources/Octorok.prefab
	project 1/Assets/Resources/Tiles/Resources/Tile43.prefab
	project 1/Assets/Tiles/Resources/Tile00.prefab
	project 1/Assets/Tiles/Resources/Tile01.prefab
	project 1/Assets/Tiles/Resources/Tile03.prefab
	project 1/Assets/Tiles/Resources/Tile04.prefab
	project 1/Assets/Tiles/Resources/Tile05.prefab
	project 1/Assets/Tiles/Resources/Tile06.prefab
	project 1/Assets/Tiles/Resources/Tile07.prefab
	project 1/Assets/Tiles/Resources/Tile08.prefab
	project 1/Assets/Tiles/Resources/Tile09.prefab
	project 1/Assets/Tiles/Resources/Tile0a.prefab
	project 1/Assets/Tiles/Resources/Tile0b.prefab
	project 1/Assets/Tiles/Resources/Tile0c.prefab
	project 1/Assets/Tiles/Resources/Tile0d.prefab
	project 1/Assets/Tiles/Resources/Tile0e.prefab
	project 1/Assets/Tiles/Resources/Tile0f.prefab
	project 1/Assets/Tiles/Resources/Tile10.prefab
	project 1/Assets/Tiles/Resources/Tile15.prefab
	project 1/Assets/Tiles/Resources/Tile16.prefab
	project 1/Assets/Tiles/Resources/Tile17.prefab
	project 1/Assets/Tiles/Resources/Tile19.prefab
	project 1/Assets/Tiles/Resources/Tile1b.prefab
	project 1/Assets/Tiles/Resources/Tile28.prefab
	project 1/Assets/Tiles/Resources/Tile29.prefab
	project 1/Assets/Tiles/Resources/Tile2a.prefab
	project 1/Assets/Tiles/Resources/Tile2e.prefab
	project 1/Assets/Tiles/Resources/Tile2f.prefab
	project 1/Assets/Tiles/Resources/Tile30.prefab
	project 1/Assets/Tiles/Resources/Tile3c.prefab
	project 1/Assets/Tiles/Resources/Tile3d.prefab
	project 1/Assets/Tiles/Resources/Tile3e.prefab
	project 1/Assets/Tiles/Resources/Tile42.prefab
	project 1/Assets/Tiles/Resources/Tile44.prefab
	project 1/Assets/Tiles/Resources/Tile50.prefab
	project 1/Assets/Tiles/Resources/Tile51.prefab
	project 1/Assets/Tiles/Resources/Tile52.prefab
	project 1/Assets/Tiles/Resources/Tile64.prefab
	project 1/Assets/Tiles/Resources/Tile65.prefab
	project 1/Assets/Tiles/Resources/Tile66.prefab
	project 1/Assets/Tiles/Resources/Tile78.prefab
	project 1/Assets/Tiles/Resources/Tile79.prefab
	project 1/Assets/Tiles/Resources/Tile7a.prefab
	project 1/Assets/Tiles/Resources/Tile8c.prefab
	project 1/Assets/Tiles/Resources/Tile8d.prefab
	project 1/Assets/Tiles/Resources/Tile8e.prefab
	project 1/Assets/Tiles/Resources/Tile8f.prefab
	project 1/Assets/Tiles/Resources/Tile90.prefab
	project 1/Assets/Tiles/Resources/Tile91.prefab
	project 1/Assets/project1.unity