Merge branch 'master' of https://github.com/varoon-fang/soidav

Conflicts:
	templates/hero.html
33333