initial commit
Merge github.com:gilmae/CuNi

Conflicts:
	.gitignore