lavet slet knap og fixet textboxe
fix merge conflict
Merge remote-tracking branch 'origin/master' into makeSmart-#1

Conflicts:
	Magtenbolle/Registration/MainWindow.xaml
	Magtenbolle/Registration/MainWindow.xaml.cs
Merge pull request #71 from ankjaers/makeSmart-#1

Make smart #1