Faaltu commit
Merge branch 'master' of https://github.com/abhidditpro2009/RealMashupFinal

Conflicts:
	web-app/css/style.css
	web-app/js/operations.js
Faaltu