Calculator update
Conflict resolved
Merge branch 'master' of https://github.com/sonianand11/feeback_app

Conflicts:
	app/views/layouts/_header.html.erb
conflict resolved