login
trying again login
APP CSS
Merge branch 'master' of https://github.com/eyanai/nextStar_app

Conflicts:
	css/small.css
	css/style.css
	index.html
	js/serverRequest.js