כפתור אפור
Merge branch 'master' of https://github.com/eyanai/nextStar_app

Conflicts:
	index.html
conflict
Merge branch 'master' of https://github.com/eyanai/nextStar_app

Conflicts:
	images/register/signin_slider_grey.png
	index.html
animation.css