splash page
fixed merge conflicts
Merge branch 'master' of github.com:kashyap-bhatt15/CuppleHub