diary2 added.
space added.
green added.
red
red2 added.
Merge branch 'green'
bluefile added.
Merge branch 'green' into blue
Merge branch 'blue'