Workspace created.
rer
Merge branch 'master' of https://github.com/stoskov/test-gitignore.git

Conflicts:
	.gitignore
	LICENSE