lets commit those files
commiting few files

Conflicts:
	Makefile
	cobbler/collection.py
leftover file merging
 this are changes