add .cvsrc
Merge branch 'master' of github.com:hythof/dotfile

Conflicts:
	Makefile