css added
fixed merge conflicts
made css changes
added splash page