Merge pull request #17 from wendinglu/login

Login
nonfunctional file upload
Merge branch 'master' into login