normal
IPAD normal.css
Merge branch 'master' of https://github.com/eyanai/nextStar_app

Conflicts:
	css/normal.css