Add pyserial dependency
Add pyserial dependency
Merge branch 'devel' of github.com:henryeherman/pyelixys into devel

Conflicts:
	requirements.txt
Add DAC set code to controlbox
COM3 for control box
Begin merge in web server code
Merge pull request #1 from henryeherman/webdevel

Begin merge in web server code
Merge pull request #2 from henryeherman/devel

Merge web into master