Added some stuff to this rails tut blog
fix merge conflict