Rename routes in compannies.rb.
Fix conflicts.
Merge branch 'new_design' of https://github.com/punchgirls/job_board into new_design