Init project
Merge branch 'master' of https://github.com/MashroomsP/cattomato

Conflicts:
	.gitignore