small changes
Merge branch 'master' of https://github.com/danielshaw/Pico

Conflicts:
	.gitignore