things
Merge branch 'master' of https://github.com/greyhound-forty/Configuration-Files

Conflicts:
	Testing/.bash_logout
	Testing/.bashrc