lets see if github does it right this time
merge

Merge branch 'master' of github.com:npai/npai.github.com