Progress on widget
Merge branch 'master' of github.com:rzhou186/Put-Call-Parity

Conflicts:
	javascripts/app.js