added token to login procedure
Merge branch 'master' of https://github.com/dennisliu1/ProjectC4413

Conflicts:
	ProjC/src/ctrl/Login.java
Merge branch 'master' of https://github.com/dennisliu1/ProjectC4413
Merge branch 'master' of https://github.com/dennisliu1/ProjectC4413
some last fixes to css