add(readme.md):
Merge branch 'master' of https://github.com/SakerONE/test

Conflicts:
	css/style.css
	js/js.js