thachbranch
photo upload added
Merge pull request #6 from me33dy/aaronbranch

most updated
paperclip
resolve merge conflict
fixing paperclip, cocaine gem, signup and sign in
fixed angular with company show page