readme
Merge branch 'master' of 107.170.173.249:/usr/share/nginx/html/sfrondy/sfrondy

Conflicts:
	README.md