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