Merge branch 'exercise5_6_1' into exercise5_6_2
Make a basic User model (including secure passwords)
Merge branch 'master' of github.com:Tacahilo/sample_app