Merge branch 'master' of github.com:JaimeVelasco/blog.dev

Conflicts:
app/models/User.php
Fixed merge conflicts I think