adds default image for map
resolved merge conflicts
resolved conflict in css
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development