change some feature

change some feature
changes some feature

changes some feature
Merge branch 'master' of https://github.com/alexis1990/ibrain

Conflicts:
	css/style.css
	index.html