log updated
final log update
build
Merge branch 'group7/master' into group7/develop
build arreglado
remove build
fixing problems
build succesful
ready