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

Conflicts:
	.gitignore
	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.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs
	Workspace_M3/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.core.prefs
	Workspace_M3/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	Workspace_M3/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi