Merged user.jade
ls
Merge branch 'master' into jackie