From home
Merge branch 'master' of https://github.com/ssteele/skeleton_codes

Conflicts:
	0_notes.txt
	git.csh