Merge michael Version
fix bugs
set ruby conventions
Merge tutorial
Merge tutorial