.
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
update ignores
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico

Conflicts:
	content/index.md
	content/sub/index.md
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico

Conflicts:
	content/index.md
Merge branch 'master' of github.com:danielshaw/Pico
Merge branch 'master' of github.com:danielshaw/Pico