gawa sa bahay
Merge branch 'master' of git@github.com:rontropia/calculator.git

Conflicts:
	calculator.js