Added 2 and 3

added 2

added 3
added 4
Merge branch 'b_two' of https://github.com/masterslayer/conflicts into b_one