my .gitignore is in the way
Fixed merge errors
Merge branch 'main' of https://github.com/aredman/finger-switch into main

Conflicts:
	.gitignore