Signed-off-by: berncosta <bmcosta@192.168.0.20>
Signed-off-by: berncosta <bemc@poli.ufrj.br>
Merge branch 'master' of https://github.com/berncosta/bufunfa

Conflicts:
	Bufunfa/bin/classes/.gitignore
	Bufunfa/bin/jarlist.cache
	Bufunfa/gen/.gitignore