In the process of a refactor
Merge branch 'master' of github.com:Verold/demos

Conflicts:
	bullrun/index.html
Merge branch 'gh-pages' of github.com:Verold/demos
Adjusted lower range of Jupiter's mass so that horseshoe orbits can form