updated config
ignore
ignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	pio.json
dep
Merge branch 'master' of github.com:firebug/dev-system