latest
Merge branch 'master' of github.com:rstudner/calculator

* 'master' of github.com:rstudner/calculator:
  latest

Conflicts:
	app/components/calculator-button.js