Merge branch 'master' of https://github.com/talapus/Documentation

Conflicts:
	README.md
Comitting