Added Login and Parent views
Merge branch 'master' of https://github.com/vaphab/GradeStar

Conflicts:
	www/index.html