trying only
Merge branch 'master' of github.com:Nikolaus/ZAMG_Antelope

Conflicts:
	rotpick/rotpick.xpy
Merge branch 'master' of github.com:Nikolaus/ZAMG_Antelope
remove contributed module
Merge branch 'master' of github.com:Nikolaus/ZAMG_Antelope
new template for python