Changed test.md
Pls werk
retry
Merge branch 'master' of github.com:CarlsbadRocks/test into frank

Conflicts:
	test.md
Merge pull request #1 from CarlsbadRocks/frank

Frank