2014 05 07   21:53
Merge branch 'master' of https://github.com/Neimarmg/ADS3M_1

Conflicts:
	Alg3_M_E/src/Controller/Registrador.java