.gitignore
Merge branch 'master' of https://github.com/una1veritas/ARMWork

Conflicts:
	.gitignore