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

Conflicts:
	Workspace_M3/.metadata/.log
	Workspace_M3/.metadata/.plugins/org.eclipse.cdt.core/firstTry.1397481984985.pdom
	Workspace_M3/.metadata/.plugins/org.eclipse.cdt.ui/firstTry.build.log
	Workspace_M3/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log
	Workspace_M3/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Workspace_M3/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Workspace_M3/firstTry/Debug/firstTry.axf
	Workspace_M3/firstTry/Debug/firstTry.map
	Workspace_M3/firstTry/Debug/firstTry_Debug.ld
	Workspace_M3/firstTry/Debug/firstTry_Debug_lib.ld
	Workspace_M3/firstTry/Debug/firstTry_Debug_mem.ld
	Workspace_M3/firstTry/Debug/src/main.o