início interface
Merge branch 'master' of github.com:Maysk/trabalho2MN1

Conflicts:
	src/matrix.cpp
	trab2MN1.pro.user