Merge changes from master into cirosantilli1

Ciro Santilli Puppet 1 authored
revision 0b0094251ae860f87fcb91c826f535c7879e27dc
# 1

1
2
3
multi
# 2

4
5
6
multi
# 2

4
a5b
6
About
### Welcome to your project!

- Brush ukdown: http://daringfireball.net/projects/markdown/basics
- Learn about Penflip: [penflip.com/help](http:// conflict)
- Talk to a person: support@penflip.com
1
2
3

Contents
> These files will be included in your book:

chapter1.txt
About.txt
chapter2-2.txt
1.txt
2.txt
conflict.md
chapter2.txt
2.txt
3.txt
conflict
a
b
c
d
e
f
g
h