Test
Test
Test
Merge branch 'master' of https://github.com/sl3-lyon/NesEmulator

Conflicts:
	.gitignore