Commit project
2
first commit
Merge remote-tracking branch 'MonHol/master'

Conflicts:
	.gitignore