several things changed
Merge branch 'master' of github.com:beitler/test-repo

Conflicts:
	wild-file