Fixed user profile with edit button
Merge branch 'master' of https://github.com/AndysDev/colabfinal

Fixed conflict in layout.blade.php