kinit
wip
Merge branch 'master' of github.com:gudata/simple_ci

Conflicts:
	.gitignore