Merge branch 'master' of ssh://git@github.com/maciejsto/JSProject.git

Conflicts:
	src/backend/config/serviceConfig.js
	src/backend/controllers/users.js
Merge branch 'develop'

Conflicts:
	web.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	web.js
Merge branch 'develop'

Conflicts:
	web.js
clearing web.js
clearing web.js
developing Arduino model
reading serial data
adding error handling for connection on serialport
refacotirng routes and controllers,
adding socket.io functionallity
refacotirng routes and controllers,
adding socket.io functionallity
refacotirng routes and controllers,
adding socket.io functionallity
refacotirng routes and controllers,
adding socket.io functionallity
refacotirng routes and controllers,
adding socket.io functionallity
committing...
refacotirng routes and controllers,
adding socket.io functionallity
merging