css image
fix comflicts to make commit
temp commit
images css
merging last commit