3ºcommit

Signed-off-by: ToPresa <topresa16@hotmail.com>
Merge branch 'master' of https://github.com/ZPaulo/LAIG

Conflicts:
	ANFScene.cpp
	ANFScene.h
	teste.anf