fixed conflicts
working on helper templates for login
working on server
pushing server files
Merge pull request #32 from coryasato/master

Server files.