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

Conflicts:
	.gitignore
rebase?
ignore
Merge remote-tracking branch 'origin/@home'

Conflicts:
	.gitignore

	modified:   .gitignore
ignore file
uvopt