initial commit
Merge branch 'master' of github.com:michaelpanco/rubytest

Conflicts:
	.gitignore