asd
Merge branch 'master' of
ssh://git@github.com/jgacitua/TrainerAppFinal.git

Conflicts:
	TrainerApp/src/database/controladores/DataBaseAdapter.java
	asdasdasdasdasdassssssssssssssssssssss
asdasdads
asdasd