Re-edited gitignore
Merge branch 'master' of https://github.com/MFDiasMarques91/SE2-SV1314

Conflicts:

Workspace_M3/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.e
clipse.debug.core.prefs

Workspace_M3/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.e
clipse.debug.ui.prefs
	Workspace_M3/firstTry/firstTry Debug.launch
Deleted some files