making significant progress on the front-end, logo done
fixed merge conflict