bug fixes
Merge branch 'master' of https://github.com/jakapp/teambenjamin

Conflicts:
	mainwindow.cpp
	mainwindow.ui
Added remove functionality