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

Conflicts:
	.DS_Store
	assets/.DS_Store
	assets/css/rgb7style.css
	pages/Search.html
	pages/landingpage.html
	pages/mygallery.html
	soidav.esproj/user.ton.espressostorage