Merge commit '31a825534b536c05f2d559da567ee8d552741685'

* commit '31a825534b536c05f2d559da567ee8d552741685':
  add login function (extra index.php to handle session)

Conflicts:
	src/index.html
	src/loginpage.php
	src/signuppage.php
Merge pull request #21 from jennjwu/dev_jenn

add login function