git ignore
Merge branch 'master' of https://github.com/araquach/jakata3

Conflicts:
	.gitignore