לא זוכר מה יש פה
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app

Conflicts:
	platforms/ios/www/js/facebook.js
	platforms/ios/www/js/script.js
דברים עתיקים
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app

Conflicts:
	platforms/ios/www/css/style.css
	platforms/ios/www/index.html
	platforms/ios/www/js/script.js