Paul's 6/9/2014 commit
Merge branch 'master' of github.com:pglbluefish/iotg1

Conflicts:
	README.md
Merge branch 'master' of github.com:pglbluefish/iotg1

Conflicts:
	README.md