knapp ändring i controller
Merge branch 'master' of https://github.com/JoelPennegard/sysa14affairs
hggu
Merge branch 'master' of https://github.com/JoelPennegard/sysa14affairs

Conflicts:
	AffairsSystem/AffairsSystem/DAL.cs
Merge branch 'master' of https://github.com/JoelPennegard/sysa14affairs.git
ändringar i contr och dal
Merge branch 'master' of https://github.com/JoelPennegard/sysa14affairs.git