Initial commit
Initial commit
Initial commit
Merge https://github.com/1dv402/1-2-rita-med-asterisker

Conflicts:
	.gitignore