added FITS form of catalog
added ellipse video script
add notes on ellipse_video.py
fixed conflicts in README, merging
Merge branch 'joezuntz-master'