GUI
Merge branch 'master' of https://github.com/FelipeLopes/SimPiMIPS

Conflicts:
	main_window.cpp