started work on the users page
minor css changes to user show page
fix conflicts in gemfile and users show page
Merge branch 'Onaracs-master'