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

Conflicts:
	web-app/css/style.css
	web-app/js/operations.js
Faaltu
Commit 4
Merge pull request #3 from abhidditpro2009/priyanka

merging changes from priyanka branch to master
deleting binaries
removing target dir
updated gitignore