Merging files
Merge branch 'master' of https://github.com/Studiosixer/CPE526Elevator

Conflicts:
	Model/randomTest.sv