matmerda
Cenas
Merge branch 'master' of github.com:aclima93/Aprendizagem_Computacional

Conflicts:
	AC2014TP2Enunc&MatlabFiles/ACOCRMatlabScripts/bridge.m
merge conflit