god dammit...what did i even change!!!
Merge branch 'master' of https://github.com/elsingc/SeniorDesign

Conflicts:
	Data_Controller.v
	Mojo-Base.xise