made a mistake with pendulum.py
Merge branch 'master' of https://github.com/pzp1997/Heschel-CS

Conflicts:
	Pendulum/pendulum.py