with viewport hieght
Merge branch 'master' of https://github.com/sreeyashu/Next-gen

Conflicts:
	.DS_Store