Images added, charity data pulled in from DB
Fixed merge conflicts