ok
Merge branches 'master' and 'master' of https://github.com/ulrikmoe/scanpay

Conflicts:
	css/main.css
	index.html