recover after failure merging
Merge branch 'stm32f103ze' of github.com:spiffykahuna/master_thesis into stm32f103ze
Programs become better and better