draw a bubble
add main contents
update header
Merge branch 'master' into yukiya

Conflicts:
	css/style.css
	index.html