pull error
Merge branch 'master' of https://github.com/Nishant-MC/SE-Final-Project

Conflicts:
	ROR/src/db.sqlite3