Edited for a conflict
Solved conflict, merged
Added sample.c file
Merge branch 'Testing' of https://github.com/jauler/STMBootloader into Testing
Commiting for a conflict
MUHAHAHA
Some changes
Merge branch 'Testing' of https://github.com/jauler/STMBootloader into Testing
Added a WOOOOORD
Merge branch 'Stable' of https://github.com/jauler/STMBootloader into Stable