adding styling for landing page
added gitignore
conflict resolution