added labels
Merge branch 'master' of https://github.com/moderndaymoron/PersonCSciVer3

Conflicts:
	mainwindow.ui