adding files from linux
trying to resolve merge conflicts in gitconfig and cshrc
Merge branch 'master' of https://github.com/cyclicredundancy/VCX

Conflicts:
	configs/tcsh/cshrc