zero in time
Merge branch 'master' of https://github.com/shaigiv/nextStar

Conflicts:
	js/showPage.js