Commited login and changes to index
Merge branch 'master' of https://github.com/ragnarka/nemeankiosk

Conflicts:
	client/index.html
Changed index