quick commit
Merge branch 'master' of https://github.com/schuncknf/TALENT

Conflicts:
	SAD_Star/hoFunction/sphericalhofunc.o