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