add login function (extra index.php to handle session)
fix merge conflict
Merge pull request #21 from jennjwu/dev_jenn

add login function