Client Logo is all setup
merge conflicts galore
more conflicts :)
Merge pull request #7 from mattyice50/paperclip

Client Logo is all setup