merging with the master
styling for user show page
fixed homepage issues
Merge branch 'master' into create