merge
Merge branch 'master' of https://github.com/sebseb7/stripe_player
Merge branch 'master' of https://github.com/sebseb7/stripe_player

Conflicts:
	firmware/main.c
	firmware/main.h