Merge branch 'gui' of https://github.com/EvanFriday/EECE381-NIOS into gui
Merge remote-tracking branch 'origin' into gui