gitignore
Merge branch 'master' of https://github.com/ashkan18/reacto

Conflicts:
	.gitignore