bug fixes
Merge branch 'master' of https://github.com/vmcafee/iolabproj2

Conflicts:
	js/script.js