a
Merge branch 'master' of https://github.com/shaigiv/nextStar

Conflicts:
	js/homepage.js
	js/login.js