Main login mostly done
Merge branch 'master' of http://github.com/cs334group1/project