changed hi -> Hello
	modified:   test.txt
Merge branch 'master' of /home/austin/Dropbox/project/source
theres a lot of weird .h files... whateva hot peppah
they are being ignored
	new file:   GUITrial1-build-desktop/GUITrial1
	new file:   GUITrial1-build-desktop/Makefile
	new file:   GUITrial1-build-desktop/ui_gui.h
	new file:   prototype/H.png
	new file:   prototype/H2.png
	new file:   prototype/HSelected.png
	new file:   prototype/N2.png
	modified:   prototype/Resourcepics.qrc
	modified:   prototype/gui.ui
	modified:   prototype/mainwindow.cpp
	modified:   prototype/mainwindow.h
	modified:   prototype/mainwindow.ui
Prototype V2. All forms are there i think, for the facilities staff anyway
	new file:   GUITrial1-build-desktop/generatereport.o
	new file:   GUITrial1-build-desktop/mainwindow.o
	new file:   GUITrial1-build-desktop/moc_generatereport.cpp
	new file:   GUITrial1-build-desktop/moc_generatereport.o
	new file:   GUITrial1-build-desktop/moc_updatebeds.cpp
	new file:   GUITrial1-build-desktop/moc_updatebeds.o
	new file:   GUITrial1-build-desktop/moc_updatewaitinglist.cpp
	new file:   GUITrial1-build-desktop/moc_updatewaitinglist.o
	new file:   GUITrial1-build-desktop/ui_generatereport.h
	new file:   GUITrial1-build-desktop/ui_updatebeds.h
	new file:   GUITrial1-build-desktop/ui_updatewaitinglist.h
	new file:   GUITrial1-build-desktop/updatebeds.o
	new file:   GUITrial1-build-desktop/updatewaitinglist.o
	new file:   prototype/generatereport.cpp
	new file:   prototype/generatereport.h
	new file:   prototype/generatereport.ui
	new file:   prototype/updatebeds.cpp
	new file:   prototype/updatebeds.h
	new file:   prototype/updatebeds.ui
	new file:   prototype/updatewaitinglist.cpp
	new file:   prototype/updatewaitinglist.h
	new file:   prototype/updatewaitinglist.ui
Prototype Finished :)
	new file:   prototype/Champlain.jpg
	new file:   prototype/H3.png
	new file:   prototype/N3.png
CHANGED RELATIVE PATH
MORE TESTS
Adding the ignore file to get rid of .o files
	new file:   .gitignore
Deleted personal files (.user)
	deleted:    prototype/GUITrial1.pro (AustinsComp's conflicted copy 2011-01-26).user
	deleted:    prototype/GUITrial1.pro.user
Added *.users to the .gitignore
	modified:   .gitignore
Adding my sockets program
	new file:   sockets/Makefile
	new file:   sockets/client.cpp
	new file:   sockets/client.h
	new file:   sockets/main.cpp
	new file:   sockets/server.cpp
	new file:   sockets/server.h
	new file:   sockets/sockets.pro
Work on my sockets program
	new file:   sockets-robbie/sockets/Makefile
	new file:   sockets-robbie/sockets/client.cpp
	new file:   sockets-robbie/sockets/client.h
	new file:   sockets-robbie/sockets/main.cpp
	new file:   sockets-robbie/sockets/server.cpp
	new file:   sockets-robbie/sockets/server.h
	new file:   sockets-robbie/sockets/sockets
	new file:   sockets-robbie/sockets/sockets.pro
Testing email notification
	modified:   test.txt
Testing email notification
	new file:   git-commit-notifier.yml
Testing email notification again...
	modified:   git-commit-notifier.yml
Testing git email commit thingy
	modified:   test.txt
Testing email notification
	modified:   git-commit-notifier.yml
Testing commit notification email thing
	modified:   git-commit-notifier.yml
Testing git email
	modified:   git-commit-notifier.yml
Testing email
	modified:   git-commit-notifier.yml