set up git
Merge branch 'master' of https://github.com/kccrouch/setup

Conflicts:
	git_setup.sh