home page done
changed name
fixed conflict