colt add avatar
fixing merge conflicts
change schema.rb conflict
merge conflict
fix conflict application.js
Merge pull request #14 from Colt/master

Add photo-pins