more changes
Merge branch 'master' of github.com:davidchase/hodge-podge