Mostly fixed the map. only a couple more niceties to change.
uugghh

	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/map.h
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	modified:   EOBC/src/DisplayMap/mapvectors.cpp
	modified:   EOBC/src/DisplayMap/mapvectors.h
Merge branch 'master' of /home/4user1/achamney/Dropbox/project/source
Merge branch 'master' of /home/4user1/repwolfe/Dropbox/project/source
Storage Handler is the base class of Storage, there will be interfaces later
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 Committer: ubuntu <ubuntu@ubuntu-VirtualBox.(none)>

 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   EOBC/EOBC.pro
	new file:   EOBC/src/Storage/storageHandler.cpp
	new file:   EOBC/src/Storage/storageHandler.h
Merge branch 'master' of /home/ubuntu/Dropbox/project/source
Fixed some issues in Model, for now leaving test code in main.cpp. Will remove later, still some issues to resolve.
	modified:   EOBC/src/Model/area.cpp
	modified:   EOBC/src/Model/area.h
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
	modified:   EOBC/src/Model/ltc_facility.cpp
	modified:   EOBC/src/Model/ltc_facility.h
	modified:   EOBC/src/Model/patient.cpp
	modified:   EOBC/src/Model/patient.h
	modified:   EOBC/src/main.cpp
Fixed Logger so that you can now append a QString variable to your message.
	modified:   EOBC/src/Common/logger.cpp
	modified:   EOBC/src/Common/logger.h
	modified:   EOBC/src/Model/area.cpp
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/main.cpp
Broke the build, fixed it.
	modified:   EOBC/src/main.cpp
Removing my temporary testing
	modified:   EOBC/src/main.cpp
More Model fixes
	modified:   EOBC/src/Model/area.cpp
	modified:   EOBC/src/Model/area.h
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
Minor Logging fixes in Facility
	modified:   EOBC/src/Model/facility.cpp
Having difficulty reading the file in storageHandler::load...
	modified:   Resources.qrc
	modified:   src/Storage/storageHandler.cpp
	modified:   src/Storage/storageHandler.h
	modified:   src/main.cpp
Created GUI for Add Facility. Renaming redirectpatientform to MovePatientForm since it's the same class for Move to Bed and Move To Facility.
	modified:   EOBC/EOBC.pro
	new file:   EOBC/bin/storage.txt
	modified:   EOBC/src/ChangeData/facilityinformationform.cpp
	modified:   EOBC/src/ChangeData/facilityinformationform.h
	new file:   EOBC/src/ChangeData/movepatientform.cpp
	new file:   EOBC/src/ChangeData/movepatientform.h
	deleted:    EOBC/src/ChangeData/redirectpatientform.cpp
	deleted:    EOBC/src/ChangeData/redirectpatientform.h
Work on GUI for MovePatientForm
	modified:   EOBC/src/ChangeData/createuserform.cpp
	modified:   EOBC/src/ChangeData/movepatientform.cpp
	modified:   EOBC/src/ChangeData/movepatientform.h
Added an icon class for facilities, and an inheritance class for any object
on the map. Made a couple changes to the scaling.

	modified:   EOBC/EOBC.pro
	modified:   EOBC/bin/PurpleArea.txt
	new file:   EOBC/bin/storage.txt
	new file:   EOBC/src/DisplayMap/facilityicon.cpp
	new file:   EOBC/src/DisplayMap/facilityicon.h
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	new file:   EOBC/src/DisplayMap/mapitem.cpp
	new file:   EOBC/src/DisplayMap/mapitem.h
Merge branch 'master' of /home/austin/Dropbox/project/source

Conflicts:
	EOBC/EOBC.pro
Added icons, they have random rates right now.
Also added info on the side.

	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/facilityicon.cpp
	modified:   EOBC/src/DisplayMap/facilityicon.h
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/map.h
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	modified:   EOBC/src/DisplayMap/mapvectors.cpp
More GUI, added UpdateWaitingListForm
	modified:   EOBC/src/ChangeData/movepatientform.cpp
	modified:   EOBC/src/ChangeData/updatewaitinglistform.cpp
	modified:   EOBC/src/ChangeData/updatewaitinglistform.h
Renamed FacilityInformationForm to AddFacilityForm, was too misleading otherwise. Added AddPatientForm. Fixed typo in displaymapcontrol's #define
	renamed:    facilityinformationform.cpp -> addfacilityform.cpp
	renamed:    facilityinformationform.h -> addfacilityform.h
	new file:   addpatientform.cpp
	new file:   addpatientform.h
	modified:   ../../EOBC.pro
	modified:   ../DisplayMap/displaymapcontrol.h
GUI for AddPatientForm
	new file:   Changes.txt
	modified:   addpatientform.cpp
	modified:   addpatientform.h
	modified:   updatewaitinglistform.cpp