Merge branch 'development'
test 3
t
t
Merge branch 'boris'

Conflicts:
	index.html
Merge branch 'miguel'

Conflicts:
	index.html
Merge branch 'development'

Conflicts:
	index.html
b
Merge branch 'betsy' into development
Merge branch 'development'
Merge branch 'gamble' into development
g
Merge branch 'gamble' into development