Merge changes from cirosantilli1 into master

Ciro Santilli authored
revision 5d01e95c65dce1b7fabcdf25b4f26d9c99f9ad86
Contents
> These files will be included in your book:

chapter1.txt
About.txt
chapter2-2.txt
1.txt
2.txt
conflict.md
chapter2.txt
3.txt
conflict2.md
conflict3.md
conflict2.md
conflict
a
1
c
d
e
f
12
h


conflict2
a
2
c
d
e
f
g
h
i
j
k
l
m
n
o
p
q
r
s
t
u
v
w
x
y
z
aa
ab
ac
ad
ae
af
ag
ah
ai
aj
ak
al
am
an
ao
ap
aq
ar
as
at
au
av
aw
ax
2
az
a
1
c
d
e
f
g
h
i
j
k
l
m
n
o
p
q
r
s
t
u
v
w
x
y
z
aa
ab
ac
ad
ae
af
ag
ah
ai
aj
ak
al
am
an
ao
ap
aq
ar
as
at
au
av
aw
ax
1
az

conflict3
# conflict3.md

Write here...