merging
Merge branch 'master' of https://github.com/scienceopen/astrometry

Conflicts:
	fits2azel.py