newarmenia
Merge branch 'master' of https://github.com/Armen2004/newarmenia

Conflicts:
	.gitignore