trying to make push work
some adjustments
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'