Rogue edits to run_SN.r?
Fixed conflicts?

Merge branch 'master' of https://github.com/jejoenje/SWBSG

Conflicts:
	run_SN.R