functions
Merge branch 'master' of https://github.com/leovieira/APEG

Conflicts:
	input/teste06.txt