Captions added and hopefully conflicts removed.
Merge branch 'master' of https://github.com/heike/sine-illusion