mike makes some changes
second deviation
Merge pull request #3 from dscheffy/mike

Mike
Merge branch 'dev' into jeff

Conflicts:
	stuff/hello