～～
？.DS_Store？what is that..

Conflicts:
	.DS_Store
css style small changes