Add pension tax tool
Conflicts:
	app.rb
	public/stylesheets/prototypes.css
	public/stylesheets/sass/prototypes.scss
Change pension calculator url
Conflicts:
	app.rb
Fix calculator bug

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