Fix calculator bug
Fix calculator bug

When user enters salary it was being set to 0
Conflicts:
	public/javascripts/app.js

guidance-guarantee-programme/alpha,guidance-guarantee-programme/alpha,guidance-guarantee-programme/alpha