fixed test on users_controller_spec
Minor style change
Images added, charity data pulled in from DB
Fixed merge conflicts
finalising landing page
closed missed css tag
fixed merge conflict