escape ampersands properly
Merge branch 'master' of github.com:devinit/D-Portal