timoweave / test9

testing git commits/merges

hello from master

1. add line from b1
2. add line from b1
3. add line from b1

a. add line from b2