Merge branch 'master' of https://github.com/lourdesriestra/firefoxos-calculadoracientifica.git