EVERYTHING IS AWESOME
Merge pull request #2 from CarlsbadRocks/rissa

EVERYTHING IS AWESOME
Merge branch 'master' of github.com:CarlsbadRocks/test into frank

Conflicts:
	test.md