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

edit page finished?
add jquery effects
add carrier wave functionality and style company shows
updated signup buttons
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
updated companies controller
Merge branch 'master' of https://github.com/henrytwang/alumni
Merge branch 'master' into update_jquery_effects
Merge pull request #76 from henrytwang/update_jquery_effects

add jquery effects
Update README.md
update gitignore file
update gitignore file... one last time... for now.
Update .gitignore
boots enabled
Merge branch 'master' into ignore_boot_seeds