asdadasd
asdasd
Merge branch 'master' of https://github.com/Prekrim/Reseplanerare-fas0

Conflicts:
	resplan.c