updates
Merge branch 'master' of https://github.com/sixtythreebits/bakuriani

Conflicts:
	web/css/style.css
update