Merge pull request #6 from jlburgos/master

Fixed pgn_test.py
updated processing.js to read json files on server
Merge branch 'master' of https://github.com/bradyp/chessmaster
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tests/counting/count.py