My rubysadventure.js commit
Nick Changes
Merge Conflicts
Merge conflicts and cleanup
Merge pull request #22 from CodeForKids/nick-branch-2

Nick branch 2