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

Conflicts:
	css/main.css
detal
Merge branch 'master' of https://github.com/annaptak/mka2.0