Some commits before pulling master from github. No idea what I changed
Merge branch 'master' of git@github.com:green0eggs/ConfigFiles
Fixed conflict on HEP
Conflicts:

	.bashrc