modified:   app/choose_payment.html
	new file:   app/choose_payment.html~
	new file:   app/resources/bitcoin-small-icon.png
	new file:   app/resources/bitcoin_logo.png
	modified:   app/resources/css/buttons.css
	new file:   app/resources/css/buttons.css~
	modified:   app/resources/css/style.css
	new file:   app/resources/css/style.css~
	new file:   app/qr_code_page.html
	new file:   app/resources/js/qrcode.js
	modified:   app/resources/css/style.css
	new file:   app/qr_code_page.html~
	modified:   app/resources/css/style.css~
Merge pull request #3 from davide-di-carlo/dev/federico_pomponii/qrcode_page

Dev/federico pomponii/qrcode page