css
Merge branch 'master' of https://github.com/annaptak/mka2.0
1
Merge branch 'master' of https://github.com/annaptak/mka2.0

Conflicts:
	css/detal.css