modified user model
Merge branch 'master' into jose
mergin from master
modified show.html and working on styling
merge files and updated css
gemfile lock, merge conflicts fixed
finally the css is working and at least we have a 'blueprint'
Merge branch 'master' of github.com:JoseChirivella14/question_box
mergin changes in 'branch' jose to master