d
Merge branch 'master' of https://github.com/pcarvalho197/Proj_c

Conflicts:
	ConsoleApplication1/ConsoleApplication1/Absence.cs

sn
Merge branch 'master' of https://github.com/pcarvalho197/Proj_c
Testes done
Merge pull request #3 from lisbao/master

com