Adds pendulum image
Adds pendulum image
Fixes conflicts
Merge remote-tracking branch 'origin/master' into gh-pages