??
Merge branch 'master' of https://github.com/eyanai/nextStar_app
IPHONE5
Merge branch 'master' of https://github.com/eyanai/nextStar_app

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

Conflicts:
	css/andrd_normal.css
	css/style.css