modified:   main.c
Makefile doesn't moan when you clean a clean, it also builds all code automagically
	modified:   MemoryAllocator/main.c
Merge remote branch 'origin/Grepwood'
Merge remote branch 'origin/HEAD'
Merge branch 'Grepwood' of github:rjames93/MOTIF into Grepwood
Merge branch 'origin/master'
Merge branch 'Grepwood'
Merge branch 'master' of github:rjames93/MOTIF