Merge branch 'master' into yufan
Merge remote-tracking branch 'origin' into yufan
Merge pull request #10 from YfLn/Tyler

Fix to isFree variable in Database creation
Added a restriction to the database description field, as well as a 'x characters remaining' label.
Merge pull request #11 from YfLn/richard

Added a restriction to the database description field, as well as a 'x characters remaining' label
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
Stylistic changes - orange navbar, blue background, rounded box for content
Merge pull request #14 from YfLn/Richard

Stylistic changes - orange navbar, blue background, rounded box for content
Merge pull request #15 from YfLn/master

just merging
db modules
up-to-date
Edit profile redirects to view profile

Clicking save will display redirect after 2sec
Shortened redirect time for view profile

Now 1sec
Fixed a test

Users are now redirected to database page on sign in so the test needed
to reflect this.
Fixed a test

Fixed signup test because it now redirects to databases page