First import
Merge branch 'master' of github.com:awalker/relation

Conflicts:
	README.md