fix merge conflict in footprints
Merge branch 'master' of https://github.com/rdnelson/Proxima
Fixed some silkscreen stuff
Added net name for swapped header row
Exported footprints
Annotations, DRC fixing, and first round of footprint matching
Merge branch 'master' of https://github.com/rdnelson/Proxima

Conflicts:
	board/footprints/footprints.mod