Merge remote-tracking branch 'origin/Smaranda'
Merge remote-tracking branch 'origin/Smaranda'
trying to make push work
some adjustments
Merge remote-tracking branch 'origin/Smaranda'
Merge branch 'master' of https://github.com/SmarandaDungeanu/CA3_OrderView into Marek

Conflicts:
	app.js
	routes/orderdetails.js
customer and employee details
Merge remote-tracking branch 'origin/Marek'
Merge remote-tracking branch 'origin/Smaranda'

Conflicts:
model/control.js
model/db.js
Merge remote-tracking branch 'origin/Smaranda'

Conflicts:
	model/control.js
	model/db.js
try to solve git problem...