Updating to new design
Merge branch 'master' of github.com:vt-amplab/basic-soldering-cert-board

Conflicts:
	monitor.bak
	monitor.sch
	power_supply-cache.lib
	power_supply.bak
	power_supply.sch