De ontem
Merge branch 'master' of https://github.com/joseaugustoneto/mar-net-ram-version-2

Conflicts:
	calc/calculadora.html
	calc/tests/features/simple.feature
	calc/tests/steps/simple.js