merging
updated missing image, and bannner
git push origin masterMerge branch 'crouseMatthew'
solved merge conflicts
fix merge conflict