make
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
adsa
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
blank
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
debug
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead

Conflicts:
	src/Makefile
blah
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead

Conflicts:
	src/Makefile
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead
Merge branch 'master' of ssh://katfs.kat.ac.za/home/adam/spead