correct p.js url
add location in prattle
Merge branch 'dev'

Conflicts:
	js/p.js
Merge branch 'master' of file:///data/git/GitHub/blog