ce

Signed-off-by: ZPaulo <jose.p.s.olive@gmail.com>
Merge branch 'master' of https://github.com/ZPaulo/LAIG
cenas

Signed-off-by: ZPaulo <jose.p.s.olive@gmail.com>
Merge branch 'master' of https://github.com/ZPaulo/LAIG

Conflicts:
	Proj-2/ANFScene.cpp
	Proj-2/LAIG_TP1_ANF_T4_G8_v2.anf