first commit
Initial CI commit
Merge branch 'master' of github.com:33mm/ci1

Conflicts:
	.gitignore