edtior incomplete
Merge branch 'master' of github.com:krishkoushik/CVGWebsite
conflicted urls
urls conflict resolved
vim editor added to problem