added buttons
..a
implemented button 1
implemented button 2
merged buttons