Adding more to git ignore
	modified:   ../.gitignore
Merge branch 'master' of /home/4user1/repwolfe/Dropbox/project/source
Merge branch 'master' of /home/robbie/Dropbox/project/source
ZZZZZZZZZZZZZz
	modified:   test.txt
JLAKSJD
	modified:   test.txt
LLLL
	modified:   test.txt
Merge branch 'master' of /home/austin/Dropbox/project/source
moar tests
	modified:   test.txt
grrrrr
	modified:   test.txt
LKJASDLKJSAD
	modified:   test.txt
fdsfds
	modified:   test.txt
 Committer: Robert Wolfe <repwolfe@lambda11.(none)>
Made sockets program P2P instead of client/server
	modified:   sockets/Makefile
	new file:   sockets/README.txt
	modified:   sockets/client.cpp
	modified:   sockets/client.h
	modified:   sockets/info
	modified:   sockets/main.cpp
	modified:   sockets/moc_server.cpp
	modified:   sockets/server.cpp
	modified:   sockets/server.h
	modified:   sockets/sockets
	modified:   sockets/sockets.pro
yay
Created file folder structure, modified project file
	new file:   EOBC/EOBC
	renamed:    EOBC/EOBC/EOBC.pro -> EOBC/EOBC.pro
	new file:   EOBC/Makefile
	new file:   EOBC/bin/moc_displaymapcontrol.cpp
	renamed:    EOBC/EOBC/displaymapcontrol.cpp -> EOBC/src/DisplayMap/displaymapcontrol.cpp
	renamed:    EOBC/EOBC/displaymapcontrol.h -> EOBC/src/DisplayMap/displaymapcontrol.h
	new file:   EOBC/src/main.cpp
Adding all the Model classes, currently empty
	modified:   EOBC/EOBC
	modified:   EOBC/EOBC.pro
	modified:   EOBC/Makefile
	new file:   EOBC/src/Model/area.cpp
	new file:   EOBC/src/Model/area.h
	new file:   EOBC/src/Model/bed.cpp
	new file:   EOBC/src/Model/bed.h
	new file:   EOBC/src/Model/facility.cpp
	new file:   EOBC/src/Model/facility.h
	new file:   EOBC/src/Model/inpatient.cpp
	new file:   EOBC/src/Model/inpatient.h
	new file:   EOBC/src/Model/ltc_facility.cpp
	new file:   EOBC/src/Model/ltc_facility.h
	new file:   EOBC/src/Model/patient.cpp
	new file:   EOBC/src/Model/patient.h
	new file:   EOBC/src/Model/waitinglist.cpp
	new file:   EOBC/src/Model/waitinglist.h
Added containers to the Model
	modified:   EOBC/EOBC
	modified:   EOBC/src/Model/area.cpp
	modified:   EOBC/src/Model/area.h
	modified:   EOBC/src/Model/bed.cpp
	modified:   EOBC/src/Model/bed.h
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
Added a new project EOBC2, correctly formatted for a gui app
Added my map stuff and robbies model
	new file:   EOBC2/EOBC/EOBC.pro
	new file:   EOBC2/EOBC/main.cpp
	new file:   EOBC2/EOBC/src/DisplayMap/displaymapcontrol.cpp
	new file:   EOBC2/EOBC/src/DisplayMap/displaymapcontrol.h
	new file:   EOBC2/EOBC/src/DisplayMap/map.cpp
	new file:   EOBC2/EOBC/src/DisplayMap/map.h
	new file:   EOBC2/EOBC/src/DisplayMap/maparea.cpp
	new file:   EOBC2/EOBC/src/DisplayMap/maparea.h
	new file:   EOBC2/EOBC/src/DisplayMap/mapvectors.cpp
	new file:   EOBC2/EOBC/src/DisplayMap/mapvectors.h
	new file:   EOBC2/EOBC/src/Model/area.cpp
	new file:   EOBC2/EOBC/src/Model/area.h
	new file:   EOBC2/EOBC/src/Model/bed.cpp
	new file:   EOBC2/EOBC/src/Model/bed.h
	new file:   EOBC2/EOBC/src/Model/facility.cpp
	new file:   EOBC2/EOBC/src/Model/facility.h
	new file:   EOBC2/EOBC/src/Model/inpatient.cpp
	new file:   EOBC2/EOBC/src/Model/inpatient.h
	new file:   EOBC2/EOBC/src/Model/ltc_facility.cpp
	new file:   EOBC2/EOBC/src/Model/ltc_facility.h
	new file:   EOBC2/EOBC/src/Model/patient.cpp
	new file:   EOBC2/EOBC/src/Model/patient.h
	new file:   EOBC2/EOBC/src/Model/waitinglist.cpp
	new file:   EOBC2/EOBC/src/Model/waitinglist.h
	new file:   EOBC2/EOBC/src/main.cpp
Merge branch 'master' of /home/robbie/Dropbox/project/source
Fixed Austin's new project folder, removed old one
	renamed:    EOBC/EOBC -> .EOBC-bkp/EOBC
	new file:   .EOBC-bkp/EOBC.pro
	new file:   .EOBC-bkp/Makefile
	new file:   .EOBC-bkp/src/DisplayMap/displaymapcontrol.cpp
	new file:   .EOBC-bkp/src/DisplayMap/displaymapcontrol.h
	new file:   .EOBC-bkp/src/DisplayMap/map.cpp
	new file:   .EOBC-bkp/src/DisplayMap/map.h
	new file:   .EOBC-bkp/src/DisplayMap/maparea.cpp
	new file:   .EOBC-bkp/src/DisplayMap/maparea.h
	new file:   .EOBC-bkp/src/DisplayMap/mapvectors.cpp
	new file:   .EOBC-bkp/src/DisplayMap/mapvectors.h
	new file:   .EOBC-bkp/src/Model/area.cpp
	new file:   .EOBC-bkp/src/Model/area.h
	new file:   .EOBC-bkp/src/Model/bed.cpp
	new file:   .EOBC-bkp/src/Model/bed.h
	new file:   .EOBC-bkp/src/Model/facility.cpp
	new file:   .EOBC-bkp/src/Model/facility.h
	new file:   .EOBC-bkp/src/Model/inpatient.cpp
	new file:   .EOBC-bkp/src/Model/inpatient.h
	new file:   .EOBC-bkp/src/Model/ltc_facility.cpp
	new file:   .EOBC-bkp/src/Model/ltc_facility.h
	new file:   .EOBC-bkp/src/Model/patient.cpp
	new file:   .EOBC-bkp/src/Model/patient.h
	new file:   .EOBC-bkp/src/Model/waitinglist.cpp
	new file:   .EOBC-bkp/src/Model/waitinglist.h
	new file:   .EOBC-bkp/src/main.cpp
	modified:   .gitignore
	modified:   EOBC/EOBC
	modified:   EOBC/EOBC.pro
	modified:   EOBC/Makefile
	new file:   EOBC/main.cpp
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/map.h
	modified:   EOBC/src/Model/area.cpp
	modified:   EOBC/src/Model/area.h
	modified:   EOBC/src/Model/bed.cpp
	modified:   EOBC/src/Model/bed.h
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
	modified:   EOBC/src/main.cpp
Removed build-desktop folder, renamed sockets-old