Merge branch 'master' of /home/4user1/repwolfe/Dropbox/project/source
Soon will remove Beds, renamed NewClasses.txt to Changes.txt
	modified:   EOBC/Makefile
	new file:   EOBC/src/Model/Changes.txt
	deleted:    EOBC/src/Model/NewClasses.txt
        deleted:    EOBC/EOBC
Removed bed from source
	modified:   EOBC/EOBC.pro
	deleted:    EOBC/EOBC
	deleted:    EOBC/src/Model/bed.cpp
        deleted:    EOBC/src/Model/bed.h
Facility might not inherit from ModelContainer anymore, instead stores a separate HashMap of Inpatients for each type of caretype required. Thinking of removing LTC_Facility.
	deleted:    EOBC/EOBC
	modified:   EOBC/Makefile
	modified:   EOBC/src/Model/Changes.txt
	deleted:    EOBC/src/Model/bed.cpp
	deleted:    EOBC/src/Model/bed.h
	modified:   EOBC/src/Model/facility.h
Made scaling better with time step, and zooming out with clicking
Also added log on subsystem, does nothing right now.

	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	modified:   EOBC/src/DisplayMap/mapvectors.cpp
	modified:   EOBC/src/DisplayMap/mapvectors.h
	new file:   EOBC/src/LogOn/logoncontrol.cpp
	new file:   EOBC/src/LogOn/logoncontrol.h
	new file:   EOBC/src/LogOn/logonwindow.cpp
	new file:   EOBC/src/LogOn/logonwindow.h
	modified:   EOBC/src/main.cpp
Merge branch 'master' of /home/austin/Dropbox/project/source
 Fixed the makefile, weird how it doesnt appear here.
If anyone else gets a problem with the beds.h problem you have to
go to the make file and delete it from there.

 Changes to be committed:
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
Worked a little more on the log on screen
	new file:   EOBC/LHINLogo2.png
	modified:   EOBC/Resources.qrc
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/mapvectors.cpp
	modified:   EOBC/src/DisplayMap/mapvectors.h
	modified:   EOBC/src/LogOn/logonwindow.cpp
	modified:   EOBC/src/LogOn/logonwindow.h
	modified:   EOBC/src/main.cpp
Almost fully implemented Facility. Haven't tested it out though, but it has several useful functions. Not sure what to do about LTC facilities.
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/GetData/getdatacontrol.h
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
	modified:   EOBC/src/Model/inpatient.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
	deleted:    EOBC/Makefile
MakeFile's are auto generated whenever we build, no point in having it on git since it will change each time we commit.
	modified:   .gitignore
	deleted:    EOBC/Makefile
Changed the map to be the one JP wanted. Nothing else changed

	modified:   EOBC/Resources.qrc
	new file:   EOBC/bin/area1.txt
	new file:   EOBC/bin/area10.txt
	new file:   EOBC/bin/area11.txt
	new file:   EOBC/bin/area12.txt
	new file:   EOBC/bin/area13.txt
	new file:   EOBC/bin/area14.txt
	new file:   EOBC/bin/area2.txt
	new file:   EOBC/bin/area3.txt
	new file:   EOBC/bin/area4.txt
	new file:   EOBC/bin/area5.txt
	new file:   EOBC/bin/area6.txt
	new file:   EOBC/bin/area7.txt
	new file:   EOBC/bin/area8.txt
	new file:   EOBC/bin/area9.txt
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/mapvectors.cpp
	modified:   EOBC/src/LogOn/logonwindow.cpp
	modified:   EOBC/src/LogOn/logonwindow.h
Merge branch 'master' of /home/austin/Dropbox/project/source
Added comments everywhere. Possibly completed Facility and LTC_Facility implementation. Just have to actually test it out. Will implement Area next, but some issues need to be resolved (If WaitingList and Inpatient classes should be removed). Added empty Logger class, that's implementation is next.
	modified:   .gitignore
	modified:   EOBC/EOBC.pro
	new file:   EOBC/src/Common/logger.cpp
	new file:   EOBC/src/Common/logger.h
	modified:   EOBC/src/Model/area.h
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
	modified:   EOBC/src/Model/inpatient.cpp
	modified:   EOBC/src/Model/inpatient.h
	modified:   EOBC/src/Model/ltc_facility.cpp
	modified:   EOBC/src/Model/ltc_facility.h
	modified:   EOBC/src/Model/patient.h
	modified:   EOBC/src/Model/waitinglist.h
Just about finished log on.
There are a couple quirks I have to work out and we have to populate the
username and password file. I made the file "accounts.txt" to put the stuff in
RAWRS
Implemented the Logger class
	modified:   EOBC/src/Common/logger.cpp
	modified:   EOBC/src/Common/logger.h
Fully implemented Logger
	modified:   .gitignore
	modified:   EOBC/src/Common/logger.cpp
	modified:   EOBC/src/Common/logger.h
Merge branch 'master' of /home/robbie/Dropbox/project/source
Fixed up the map. It still looks weird. Give it time
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	modified:   EOBC/src/DisplayMap/mapvectors.cpp
	modified:   EOBC/src/DisplayMap/mapvectors.h
	modified:   EOBC/src/LogOn/logonwindow.cpp
Changed Logger to only static functions.
	modified:   EOBC/src/Common/logger.cpp
	modified:   EOBC/src/Common/logger.h
Added convenience function class, made the GUI for CreateUser
	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/ChangeData/createuserform.cpp
	modified:   EOBC/src/ChangeData/createuserform.h
	new file:   EOBC/src/Common/convenience.cpp
	new file:   EOBC/src/Common/convenience.h
	modified:   EOBC/src/Model/inpatient.cpp
	modified:   EOBC/src/Model/patient.cpp
	modified:   EOBC/src/Model/patient.h