Rotationalisms
Merge branch 'solarSystems' of https://github.com/fabienallouis/stars into solarSystems

Conflicts:
	public/js/app.js
	public/js/models.js