Merge pull request #2 from tiger-swallowtails-2014/william

William
commit for merge
solved merge conflict:
Merge pull request #3 from tiger-swallowtails-2014/mike

Mike
User can sign up, sign in, and sign out