fixed angular with company show page
commit before attempting paperclip
REMOVED ANGULAR
resolved merge conflict
images, index
revert stashed changes
resolved merge conflicts
Merge pull request #9 from me33dy/aaronbranch

Aaronbranch