Fix wiki link in readme

Fixes #23
Merge branch 'master' of https://github.com/greypants/gulp-starter
Merge branch 'master' of https://github.com/mrtnbroder/gulp-starter
use em instead if % and use sp mixing for parahraph tag
fix merge conflict