Update 2014-02-01-Introduction.md

Resolved a conflict