Checkout testing
Merge branch 'master' of https://github.com/kishandchips/ivip

Conflicts:
	css/style.css
Changed grid
Merge branch 'master' of https://github.com/kishandchips/ivip

Conflicts:
	css/scss/_layout.scss
	css/style.css