Merge branch 'master' into yufan
Merge remote-tracking branch 'origin' into yufan
db modules
up-to-date
small fix
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into yufan
Merge pull request #18 from YfLn/Richard

The 'username' field required a 'unique' attribute in order for the final test to pass.
Ran test
Ran test
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into yufan
Merge pull request #20 from YfLn/yufan

Yufan
nvm
Merge pull request #21 from YfLn/yufan

nvm
nvm
Merge pull request #22 from YfLn/yufan

nvm
time for bed
Merge pull request #23 from YfLn/yufan

...
ok
Merge pull request #24 from YfLn/yufan

ok
Merge pull request #25 from YfLn/master

Updating Richard branch from master