.
Merge branch 'master' of https://github.com/vippans/vippans_git_repo1

Conflicts:
	README.txt