zxc
Merge remote-tracking branch 'origin/master'

Conflicts:
	armazem.c
Merge remote-tracking branch 'origin/master'
asd