Merge branch 'master' of github.com:ThomasFeher/oms

Conflicts:
	.gitignore
	beamSteering.m