git commit -a
git commit -a
git commit -a
Merge branch 'pixelgui_splitters'

Conflicts:
	pixelgui.root
git commit -a
	modified:   DACbuilder.cc
	modified:   DACbuilder.hh
	modified:   README
	modified:   firstTest.cc
	modified:   mainFrame.cc
	modified:   secondTest.cc
	modified:   testBase.cc
	modified:   testBase.hh