Test
Merge branch 'master' of https://github.com/danielhood/general

Conflicts:
	git.txt