fix merge conflict

fix merge conflict
test

test
ok

ok
Merge branch 'master' of https://github.com/alexis1990/ibrain

Conflicts:
	css/image/bureau.jpg
	css/style.css
	index.html
	php/vote_result.txt