edit e
Merge branch 'temp'
master edit
temp edit
merge and take temp
master edit 2
temp edit 2
merge and take temp2
master edit 3
temp edit 3 and add asdf
merge and create new
temp edit 4
master edit 4
merge and take master