bug fix
Merge branch 'master' of github.com:JoonasMelin/ase_groupwork

Conflicts:
	s9/naoMap.m