1th
Initial commit
merg with remote
2th
3th
Merge branch 'master' into r_master

Conflicts:
	README.md