update
update

Conflicts:
	css/style.css
	sample-idea/splash/css/style.css
	sample-idea/splash/index.html
update