Test for Salvi
Test
Merge pull request #1 from stucki/test

Test for Salvi
This should give you a conflict
Test
Merge branch 'test' of https://github.com/stucki/test into stucki-test

Conflicts:
	README.md