password must be characters or numbers, cannot be specific symbol
Merge branch 'master' of https://github.com/wilwong/csc309-v2
typo and stuff
Merge branch 'master' of github.com:wilwong/csc309-v2
Merge master conflicts fixed