Merge pull request #12 from YfLn/master

Merge pull request #2 from YfLn/master
Changed unit tests to reflect user models, corrected an error where users could not make passwords of length 6
Merge branch 'master' of github.com:YfLn/CEN3031FA14 into richard
Merge branch 'Richard' of github.com:YfLn/CEN3031FA14 into Richard
Updated tests for user model, as well as corrected error with password length on signup page
Merge pull request #13 from YfLn/Richard

Richard