change avatar logo name
remove avatar.jpg
fix Gemfile.lock merge conflict
fix merge conflict
merge start from scratch
Merge branch 'master' of github.com:jimnanney/rubyonsails
adding branding and images
Merge pull request #7 from jimnanney/addimages

Addimages