fdsfd
ds

dsa
Merge branch 'master' of https://github.com/cmrodriguez25/PW_AR_APP_FINAL

Conflicts:
	VuforiaTesting/VuforiaTesting/ProjectListViewController.m
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/109ave.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/CampusDrive.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Corner.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/CubeWindows.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Diesel.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Directory.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/EastExitStair.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/EmergencyCallBox.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/FireAlarm.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/FiuArtsScience.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Lobby.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Lobby300.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/MegaPhone.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Peek.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/RectangleLight.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Room309d.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/SchoolSign.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Speakers.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Stair12Floor.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Stair13Floor.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/StairBench.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/StairFlight2.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Stair_Flight.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC4 -
Science_Classroom_Complex (FIU)/Models/Stairs.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Map/Project1.png
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/109ave.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/CampusDrive.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Corner.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/CubeWindows.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Diesel.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Directory.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/EastExitStair.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/EmergencyCallBox.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/FireAlarm.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/FiuArtsScience.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Lobby.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Lobby300.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/MegaPhone.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Peek.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/RectangleLight.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Room309d.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/SchoolSign.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Speakers.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Stair12Floor.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Stair13Floor.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/StairBench.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/StairFlight2.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Stair_Flight.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Models/Stairs.txt
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Overlays/Room309.png
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Picture/Project1.png
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Targets/HighQuality.dat
	VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/AHC5 -
Public_Health_Sciences (FIU)/Targets/HighQuality.xml

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Map/Project1.png

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/109ave.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/CampusDrive.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Corner.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/CubeWindows.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Diesel.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Directory.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/EastExitStair.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/EmergencyCallBox.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/FireAlarm.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/FiuArtsScience.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Lobby.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Lobby300.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/MegaPhone.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Peek.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/RectangleLight.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Room309d.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/SchoolSign.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Speakers.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Stair12Floor.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Stair13Floor.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/StairBench.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/StairFlight2.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Stair_Flight.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Models/Stairs.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Overlays/Room309.png

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Picture/Project1.png

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Targets/HighQuality.dat

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Academic_Support
_Center (FIU)/Targets/HighQuality.xml

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Map/Project1.png

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/109ave.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/CampusDrive.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Corner.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/CubeWindows.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Diesel.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Directory.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/EastExitStair.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/EmergencyCallBox.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/FireAlarm.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/FiuArtsScience.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Lobby.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Lobby300.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/MegaPhone.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Peek.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/RectangleLight.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Room309d.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/SchoolSign.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Speakers.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Stair12Floor.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Stair13Floor.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/StairBench.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/StairFlight2.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Stair_Flight.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Models/Stairs.txt

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Overlays/Room309.png

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Picture/Project1.png

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Targets/HighQuality.dat

VuforiaTesting/VuforiaTesting/Resources/Assets/Projects/Clinical_Transla
tional_Research (MDC)/Targets/HighQuality.xml
fdsa

fdas
Deleting incorrect folder

dsdas
Deleting unused files

dsadas
changing name to include underscore instead of spaces

dsa
Commiting font change

fds
cds
Merge remote-tracking branch 'origin/master'