image in tv fb
fb
Merge branch 'master' of https://github.com/eyanai/nextStar_app
fb
Merge branch 'master' of https://github.com/eyanai/nextStar_app

Conflicts:
	css/style.css
	js/script.js
fb
Merge branch 'master' of https://github.com/eyanai/nextStar_app