resolve conflict
Merge remote-tracking branch 'origin/master'
filepicker
filepicker
filepicker design integration
 commiting filepicker
commiting modified edit and view school page
removing flicker api key from application.rb
Merge pull request #37 from deepak496/social-share

Social share