- Initialized project
Merge branch 'master' of github.com:schlingel/cis

Conflicts:
	.gitignore
 Resolved