includes alterados
commit pa
Merge branch 'master' of https://github.com/MFDiasMarques91/SE2-SV1314

Conflicts:
	Workspace_M3/CMSIS_CORE_LPC17xx/.cproject