my first ruby demo
Merge branch 'master' of https://github.com/ietjxdl/JustDemo

Conflicts:
	.gitignore