Switched to 'pretty' permalinks
Merge branch 'master' of github.com:zperrault/zperrault.github.io