edit page finished?
Merge pull request #75 from henrytwang/style_edit_more

edit page finished?
add carrier wave functionality and style company shows
Merge pull request #77 from henrytwang/carrierwave_start

add carrier wave functionality and style company shows
Merge branch 'master' of https://github.com/henrytwang/alumni
Update companies_controller.rb
Merge branch 'master' of https://github.com/henrytwang/alumni
Merge branch 'master' into update_jquery_effects