Changed the GEMFILE
Changed the color of the buttons
Merge branch 'master' of https://github.com/Neologis/MyApp