Commited lingering edits, probably mostly parameter changes
Merge branch 'master' of https://github.com/JonatanKilhamn/sp-kernel

Conflicts:
	my_code/roadData_fwcombined.m
Merge branch 'master' of https://github.com/JonatanKilhamn/sp-kernel

Conflicts:
	my_code/roadData_fwcombined.m