remove stray Project/trial1/main.hex
Merge branch 'master' of https://github.com/barnex/stm32-playground

Conflicts:
	Project/trial1/main.hex