before merge image files
Merge branch 'master' of github.com:romanegloo/Evergreen-Church
footer css conflict