this is commit from snowy2
Merge branch 'master' of https://github.com/prashantskhodade/snowy

Conflicts:
	index.html

this is after merge