"Nenhuma alteração!!"
Merge branch 'master' of https://github.com/a50428/AFM

Conflicts:
	menu_1.o
Merge branch 'master' of https://github.com/a50428/AFM
Update de menu_2.c 03112014

Conflicts:
	menu_1.o