altered something.txt from windows
more changes
Merge branch 'master' of https://github.com/sbvb/test

Conflicts:
	something.txt