Testing conflicts
Merge branch 'master' of https://github.com/chriskuusmann/test

Conflicts:
	read.md