s
j
Merge branch 'master' of https://github.com/ranjeev75/mscproject.git

Conflicts:
	src/static/main.js