changes
Merge branch 'master' of https://github.com/madalinplastoi/RBS

Conflicts:
	Phase1/routes/database.js
	Phase1/routes/index.js
	Phase1/views/salary-distribution.ejs