Update 2.0

Some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/main.c
	source/nesPPU.c