do some work on index.css
Merge branch 'iss02'

Conflicts:
	index.css
Merge remote-tracking branch 'origin/master'