Now running on port 80
fixed merge conflicts