Baseline
Merge branch 'master' of https://github.com/progrock/serialserver

Conflicts:
	app.js