adder two buttons on the story board MAIN
Merge remote-tracking branch 'origin/master'
big spaghetti commit