added CORS
CORS working, fixed up home.html
fixed merge conflict