basic website FINALLY WORKING
fixed merge conflict