changed table styles, wrapped company views in divs
merged branch-r with master branch
resolved conflicts with app/views/companies/index.html.erb
Merge branch 'master' into branch-r
fixed conflicts in stylesheet
terrible explaination, trying to clean my branch