Merge branch 'shivvy2'
Merge branch 'master' of https://github.com/chintanparikh/startup-exchange-web-new