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

Conflicts:
	ConsoleApplication1/ConsoleApplication1/ResourceManagement.cs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ConsoleApplication1/ConsoleApplication1/Resource.cs
	ConsoleApplication1/ConsoleApplication1/ResourceManagement.cs