modified blog instructions
fixed merge conflicts
removed whitespace
Merge remote-tracking branch 'upstream/master'