completed...
Merge branch 'adding_simple_buttons_with_on_click_listeners' into develop