added beer and euro switch
Merge branch 'master' of https://github.com/levisteenbergen/ING-hackathon

Conflicts:
	js/popup.js