merge fail
Merge branch 'gui' of https://github.com/EvanFriday/EECE381-NIOS