project 1
Merge branch 'master' of http://github.com/abeve/Ruby-Assignment