add some change
Merge branch 'master' of github.com:antoniopuero/liveMonitor

Conflicts:
	.idea/workspace.xml
	public/css/style.css