git ignore
Merge branch 'master' of github.com:ARACOOOL/master

Conflicts:
	.gitignore