deleted:    app/resources/buttons/button-bitcoin-hover.png
	deleted:    app/resources/buttons/button-bitcoin.png
	deleted:    app/resources/buttons/button-index-hover.png
	deleted:    app/resources/buttons/button-index.png
	deleted:    app/resources/buttons/button-visa-hover.png
	deleted:    app/resources/buttons/button-visa.png
	new file:   app/resources/button-bitcoin-hover.png
	new file:   app/resources/button-bitcoin.png
	new file:   app/resources/button-index-hover.png
	new file:   app/resources/button-index.png
	new file:   app/resources/button-visa-hover.png
	new file:   app/resources/button-visa.png
	modified:   app/choose_payment.html
	modified:   app/index.html
	modified:   app/qr_code_page.html
	modified:   app/resources/css/style.css
	modified:   app/choose_payment.html
	modified:   app/m.choose_payment.html
	modified:   app/m.index.html
	modified:   app/resources/css/style.css
	modified:   app/choose_payment.html
	modified:   app/qr_code_page.html
Merge pull request #46 from davide-di-carlo/dev/davide_di_carlo/avoidConflicts

Dev/davide di carlo/avoid conflicts