initial commit
Merge branch 'master' of github.com:chrhsmt/test_gem

Conflicts:
	.gitignore
	README.md