initial commit
Merge branch 'master' of github.com:lcvinny/gotest

Conflicts:
	.gitignore