added Buttons
added prompt
merge conflicts
Merge branch 'master' of github.com:MallorcaDojo/barcelona