changed something.txt in windows
Merge branch 'master' of https://github.com/sbvb/test

Conflicts:
	something.txt
sbvb from windows