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
made the Order Details page a bit more arranged
Merge remote-tracking branch 'origin/Marek'
try to solve git conflict
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...
Merge remote-tracking branch 'origin/Smaranda'
Merge remote-tracking branch 'origin/Cristi'

Conflicts:
	model/control.js
	model/db.js
	routes/orderdetails.js
	views/orderdetails.jade
FIX FROM GIT MERGE
Merge remote-tracking branch 'origin/Marek'
back button added
changed a port number
almost done with Bonus II
Merge remote-tracking branch 'origin/Smaranda'
Merge remote-tracking branch 'origin/Marek'
finished Bonus II