Armazenar update
Merge branch 'master' of https://github.com/fcouceiro/projectoEDA2013
Armazenar done
Armazenar fix