added logic lesson to R Programming
fixed manifest conflicts
tweaked logic lecture
fixed some small typos etc
fix message about dplyr version thanks to @sabaini
tweaked lesson
resolved conflicts
changed course type
Merge pull request #43 from swirldev/logic

Added Logic lecture