jeff makes some changes
Merge branch 'dev' into jeff

Conflicts:
	stuff/hello
Merge pull request #4 from dscheffy/jeff

jeff makes some changes