Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'master' of git://github.com/couryrr/TeamContent into develop
Added back login processing page.
Added back hashing to registration
Moved the login logic to index.php
Merge branch 'fixLogin' into develop
BUG: Login session doesn't follow user.
Initial commit of passwords page.
Added links, fixed formatting issues.
Added basic form for quiz/check on password article
Added results page.
Added basic results showing score rank.
Merge branch 'passwordsArticle' into develop
Added missing session_start()
Login is working now.
Merge pull request #3 from patrickshehan/develop

Merging password stuff