initial commit
Merge branch 'master' of github.com:guhang10/rubyjunky

Conflicts:
	.gitignore