Fixing javascript problems
Merge branch 'ruby_the_hard_way'