adding a .gitignore file
forgot to switch startup file back to stm32f0
tweak to .gitignore
adding a .gitignore file
tweak to .gitignore
Merge remote-tracking branch 'origin/stm32f0-discovery-basic-template'

Conflicts:
	Libraries/Makefile
	Makefile

Merging my makefile updates into my F3 Discovery template
Merge branch 'master' into puzzle_box

Conflicts:
	Makefile