Add charities to profile
Fix conflict
User can select charity
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork