Merge branch 'master' of /local/code/Rails_projects/bbd_blog with conflicts.
Merge remote-tracking branch 'origin/master'
added specs