js game
Merge branch 'jsgame' of github.com:johand/free-programming-books into johand-jsgame

Conflicts:
	free-programming-books.md