Merge branch 'master' of https://github.com/lukeKeen/MsTeMiniprojekt

Conflicts:
	AutoReservation.v12.suo