fixed html, added some shared content
commiting before I change the version of rails-backbone
updated rails-backbone version to the one that supports patch
fixed company image uploading. cleaned some code
merged conflicts
Merge pull request #196 from CalvinFernandez/merge-files

merge-files
Resolved merge conflicts
Gemfile.lock updated