latest
Merge branch 'gh-pages' of https://github.com/peteward44/WebNES into gh-pages

Conflicts:
	js/nes.min.js