Translating almost everything, starting to style buttons
Merge branch 'master' of https://github.com/7EHR4F/my_photo_booth

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	log/development.log
	tmp/pids/server.pid
changing style and translating views