kevin stuff
merge stuff
Merge branch 'master' of https://github.com/agleason6/ECE6414_master

Conflicts:
	ST_beta_mult_ref/schematic/data.dm
	ST_beta_mult_ref/schematic/sch.oa
	ST_beta_mult_ref/schematic/thumbnail_128x128.png
	ST_p_ota/schematic/data.dm
	ST_p_ota/schematic/sch.oa