added 50k pullup to CS1 again, since we can leave it unpopulated
Merge branch 'master' of https://github.com/rdnelson/Proxima

Conflicts:
	board/mainboard/SPI_peripherals.sch
Merge branch 'master' of https://github.com/rdnelson/Proxima