fixed index page
Merge branch 'master' of https://github.com/cs147win2014/project

# By Isabelle Woodrow
# Via Isabelle Woodrow
* 'master' of https://github.com/cs147win2014/project:
  fixed bugs in login page, now says incorrect username or password and added a get for /login